diff --git a/doc/fixes34.1 b/doc/fixes34.1
index e9cae5d61..7e4550723 100644
--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -277,6 +277,7 @@ when summoning nasty monsters, use new monster's type to decide if they can
 don't display the "intones:" prefix when !soundok since the message suffix
 	won't be displayed in this case
 document "sound" option in Guidebook
+destroy traps that are buried by boulders dropped in water
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/do.c b/src/do.c
index a255ca20e..95fc8d5ce 100644
--- a/src/do.c
+++ b/src/do.c
@@ -72,13 +72,17 @@ boolean pushing;
 	    fills_up = lava ? chance == 0 : chance != 0;
 
 	    if (fills_up) {
+		struct trap *ttmp = t_at(rx, ry);
+
 		if (ltyp == DRAWBRIDGE_UP) {
 		    levl[rx][ry].drawbridgemask &= ~DB_UNDER; /* clear lava */
 		    levl[rx][ry].drawbridgemask |= DB_FLOOR;
 		} else
 		    levl[rx][ry].typ = ROOM;
 
+		if (ttmp) (void) delfloortrap(ttmp);
 		bury_objs(rx, ry);
+		
 		newsym(rx,ry);
 		if (pushing) {
 		    You("push %s into the %s.", the(xname(otmp)), what);