diff --git a/doc/fixes35.0 b/doc/fixes35.0
index 3ee77e4a0..e44f6d6ea 100644
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -69,6 +69,7 @@ a slow-moving monster hidden under a rotting corpse was not immediately
 	displayed when the corpse rotted away
 mimic that ends up on the rogue level should not mimic a closed door
 polymorphed or shapechanged monster sometimes got erroneous hit points
+mimic should not mimic a boulder while on a pit or hole location
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/makemon.c b/src/makemon.c
index 2a7de4253..5c616e8e1 100644
--- a/src/makemon.c
+++ b/src/makemon.c
@@ -1695,10 +1695,10 @@ register struct monst *mtmp;
 
 		if(!mtmp->minvis || See_invisible)
 		    block_point(mx,my);	/* vision */
-	} else if (level.flags.is_maze_lev && rn2(2)) {
+	} else if (level.flags.is_maze_lev && !In_sokoban(&u.uz) && rn2(2)) {
 		ap_type = M_AP_OBJECT;
 		appear = STATUE;
-	} else if (roomno < 0) {
+	} else if (roomno < 0 && !t_at(mx, my)) {
 		ap_type = M_AP_OBJECT;
 		appear = BOULDER;
 		if(!mtmp->minvis || See_invisible)