diff --git a/doc/fixes35.0 b/doc/fixes35.0
index c8ffe572b..e9a97e822 100644
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -103,6 +103,7 @@ grammar bit if killed by stealing a cockatrice corpse from a monster
 being petrified by swallowing a cockatrice violates foodless conduct
 devouring Medusa whole is fatal
 eating pet won't continue eating after becoming paralyzed or falling asleep
+randomize shopkeeper names when hallucinating
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/shknam.c b/src/shknam.c
index 32b5c378d..c0cead964 100644
--- a/src/shknam.c
+++ b/src/shknam.c
@@ -1,4 +1,4 @@
-/*	SCCS Id: @(#)shknam.c	3.5	2005/03/05	*/
+/*	SCCS Id: @(#)shknam.c	3.5	2005/12/14	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -653,6 +653,22 @@ struct monst *mtmp;
 {
     const char *shknm = ESHK(mtmp)->shknam;
 
+    if (Hallucination && !program_state.gameover) {
+	const char * const *nlp;
+	int num;
+
+	/* count the number of non-unique shop types;
+	   pick one randomly, ignoring shop generation probabilities;
+	   pick a name at random from that shop type's list */
+	for (num = 0; num < SIZE(shtypes); num++)
+	    if (shtypes[num].prob == 0) break;
+	if (num > 0) {
+	    nlp = shtypes[rn2(num)].shknms;
+	    for (num = 0; nlp[num]; num++) continue;
+	    if (num > 0) shknm = nlp[rn2(num)];
+	}
+    }
+
     /* strip prefix if present */
     if (!letter(*shknm)) ++shknm;
     return shknm;