diff --git a/doc/fixes34.1 b/doc/fixes34.1
index dee7569bc..9da922c11 100644
--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -203,3 +203,4 @@ mouse_support wincap option
 debug mode: #panic routine to test panic() and panic save file generation
 a new PANICLOG optional file to log the reason for panic and impossible messages
 added validate_prefix_locations() for early directory prefix validation
+fire traps are particularly bad for paper and straw golems
diff --git a/src/trap.c b/src/trap.c
index bfd5ed57a..8a473c9d4 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -1687,6 +1687,13 @@ glovecheck:		    target = which_armor(mtmp, W_ARMG);
 			} else {
 			    int num = d(2,4);
 
+			    /* paper burns very fast, assume straw is tightly
+			     * packed and burns a bit slower */
+			    if (mptr == &mons[PM_PAPER_GOLEM])
+				num = mtmp->mhp;
+			    else if (mptr == &mons[PM_STRAW_GOLEM])
+				num = mtmp->mhpmax / 2;
+
 			    if (thitm(0, mtmp, (struct obj *)0, num))
 				trapkilled = TRUE;
 			    else