diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt
index 658364a35..803503437 100644
--- a/doc/fixes3-7-0.txt
+++ b/doc/fixes3-7-0.txt
@@ -1019,6 +1019,7 @@ monsters can blind you with a camera
 lit candles generated by wishing could have wrong light radius
 better feedback from detect unseen
 make public server admin messages use urgent_pline
+cannot kick while squeezed on top of a boulder
 
 
 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository
diff --git a/src/dokick.c b/src/dokick.c
index 05abe7df7..b2419735c 100644
--- a/src/dokick.c
+++ b/src/dokick.c
@@ -905,6 +905,9 @@ dokick(void)
         default:
             break;
         }
+    } else if (sobj_at(BOULDER, u.ux, u.uy) && !Passes_walls) {
+        pline("There's not enough room to kick in here.");
+        no_kick = TRUE;
     }
 
     if (no_kick) {