diff --git a/doc/fixes36.4 b/doc/fixes36.4
index 5865224cc..d42e88c86 100644
--- a/doc/fixes36.4
+++ b/doc/fixes36.4
@@ -1,4 +1,4 @@
-$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.0 $ $NHDT-Date: 1575665952 2019/12/06 20:59:12 $
+$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.3 $ $NHDT-Date: 1576282492 2019/12/14 00:14:52 $
 
 This fixes36.4 file is here to capture information about updates in the 3.6.x
 lineage following the release of 3.6.3 in December 2019.  Hypothetical version
@@ -10,6 +10,10 @@ GDBPATH and GREPPATH from sysconf or -D... on compilation command line were
 	being processed even if PANICTRACE was disabled but only being freed
 	at end of game when that was enabled
 fix the article used in the message when your steed encounters a polymorph trap
+alloc teleporting onto the vibrating square
+message "your knapsack can't accomodate any more items" when picking stuff up
+	or removing such from container was inaccurate if there was some gold
+	pending; vary the message rather than add more convoluted pickup code
 dozen-ish assorted spelling/typo fixes in messages and source comments
 
 
diff --git a/src/pickup.c b/src/pickup.c
index 49fbc609b..6d932912d 100644
--- a/src/pickup.c
+++ b/src/pickup.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	pickup.c	$NHDT-Date: 1575542023 2019/12/05 10:33:43 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.251 $ */
+/* NetHack 3.6	pickup.c	$NHDT-Date: 1576282488 2019/12/14 00:14:48 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.237 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2012. */
 /* NetHack may be freely redistributed.  See license for details. */
diff --git a/src/teleport.c b/src/teleport.c
index e6c1e120e..c6093038e 100644
--- a/src/teleport.c
+++ b/src/teleport.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	teleport.c	$NHDT-Date: 1575245091 2019/12/02 00:04:51 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.94 $ */
+/* NetHack 3.6	teleport.c	$NHDT-Date: 1576281515 2019/12/13 23:58:35 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.95 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2011. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -263,6 +263,7 @@ boolean trapok;
     if (!trapok) {
         /* allow teleportation onto vibrating square, it's not a real trap */
         struct trap *trap = t_at(x, y);
+
         if (trap && trap->ttyp != VIBRATING_SQUARE) {
             return FALSE;
         }