diff --git a/doc/fixes36.1 b/doc/fixes36.1
index e1c5c4468..bb8c17505 100644
--- a/doc/fixes36.1
+++ b/doc/fixes36.1
@@ -519,6 +519,8 @@ change the deity's "congratulations" message upon ascension to something which
 	sounds a bit more archaic to fit better with the other messages
 prayer boon of 'fix all troubles' could get stuck in an infinite loop for
 	TROUBLE_STUCK_IN_WALL if there was no spot to teleport into available
+It shouldn't be considered hypocrisy if you speed up your pet while standing 
+	on Elbereth
 
 
 Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository
diff --git a/src/zap.c b/src/zap.c
index 4ab138938..233ebfee7 100644
--- a/src/zap.c
+++ b/src/zap.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	zap.c	$NHDT-Date: 1513297348 2017/12/15 00:22:28 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.270 $ */
+/* NetHack 3.6	zap.c	$NHDT-Date: 1520705645 2018/03/10 18:14:05 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.271 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -137,6 +137,7 @@ struct obj *otmp;
     boolean wake = TRUE; /* Most 'zaps' should wake monster */
     boolean reveal_invis = FALSE, learn_it = FALSE;
     boolean dbldam = Role_if(PM_KNIGHT) && u.uhave.questart;
+    boolean helpful_gesture = FALSE;
     int dmg, otyp = otmp->otyp;
     const char *zap_type_text = "spell";
     struct obj *obj;
@@ -192,6 +193,8 @@ struct obj *otmp;
             mon_adjust_speed(mtmp, 1, otmp);
             m_dowear(mtmp, FALSE); /* might want speed boots */
         }
+        if (mtmp->mtame)
+            helpful_gesture = TRUE;
         break;
     case WAN_UNDEAD_TURNING:
     case SPE_TURN_UNDEAD:
@@ -426,7 +429,7 @@ struct obj *otmp;
     }
     if (wake) {
         if (mtmp->mhp > 0) {
-            wakeup(mtmp, TRUE);
+            wakeup(mtmp, helpful_gesture ? FALSE : TRUE);
             m_respond(mtmp);
             if (mtmp->isshk && !*u.ushops)
                 hot_pursuit(mtmp);