diff --git a/doc/fixes34.1 b/doc/fixes34.1
index ef35cbb05..dfcb17e09 100644
--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -390,6 +390,7 @@ wielding Werebane prevents catching lycanthropy via monster attack (but not
 	via eating, nor does it cure an existing case)
 character inflicted with lycanthropy is vulnerable to Werebane when in
 	human/elf/&c form as well as when in beast form
+shopkeeper could get angry without remembering the customer name
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/shk.c b/src/shk.c
index 971bd58cc..83de96711 100644
--- a/src/shk.c
+++ b/src/shk.c
@@ -999,6 +999,7 @@ register struct monst *shkp;
 	if(!shkp->isshk) return;
 
 	rile_shk(shkp);
+	(void) strncpy(ESHK(shkp)->customer, plname, PL_NSIZ);
 	ESHK(shkp)->following = 1;
 }
 
@@ -2469,8 +2470,6 @@ register boolean peaceful, silent;
 
 	    if(!silent) {
 		if(cansee(shkp->mx, shkp->my)) {
-		    if(ESHK(shkp)->customer[0] == 0)
-			(void) strncpy(ESHK(shkp)->customer,plname,PL_NSIZ);
 		    Norep("%s booms: \"%s, you are a thief!\"",
 				Monnam(shkp), plname);
 		} else  Norep("You hear a scream, \"Thief!\"");