diff --git a/doc/fixes36.1 b/doc/fixes36.1
index 47feb85aa..c49d68dca 100644
--- a/doc/fixes36.1
+++ b/doc/fixes36.1
@@ -45,6 +45,8 @@ make MAXPLAYERS option in sysconf accept 0 value
 avoid hearing yelps when you are deaf
 make corpse visible if stethoscope told you about it being there
 sceptre of might database entry word change
+avoid "spellbook of novel" on discoveries list after object ID of novel
+add novel to discoveries list after reading one
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/objnam.c b/src/objnam.c
index 4d368ec5a..449be7057 100644
--- a/src/objnam.c
+++ b/src/objnam.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	objnam.c	$NHDT-Date: 1450306207 2015/12/16 22:50:07 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.158 $ */
+/* NetHack 3.6	objnam.c	$NHDT-Date: 1450584419 2015/12/20 04:06:59 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.159 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -120,7 +120,12 @@ register int otyp;
         Strcpy(buf, "wand");
         break;
     case SPBOOK_CLASS:
-        Strcpy(buf, "spellbook");
+        if (otyp != SPE_NOVEL) {
+            Strcpy(buf, "spellbook");
+        } else {
+            Strcpy(buf, !nn ? "book" : "novel");
+            nn = 0;
+        }
         break;
     case RING_CLASS:
         Strcpy(buf, "ring");
diff --git a/src/spell.c b/src/spell.c
index 0ec696b3e..436919276 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	spell.c	$NHDT-Date: 1450306224 2015/12/16 22:50:24 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.74 $ */
+/* NetHack 3.6	spell.c	$NHDT-Date: 1450584420 2015/12/20 04:07:00 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.75 $ */
 /*      Copyright (c) M. Stephenson 1988                          */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -474,6 +474,7 @@ register struct obj *spellbook;
                              spellbook->o_id)) {
                 u.uconduct.literate++;
                 check_unpaid(spellbook);
+                makeknown(booktype);
                 if (!u.uevent.read_tribute) {
                     /* give bonus of 20 xp and 4*20+0 pts */
                     more_experienced(20, 0);