diff --git a/doc/fixes34.2 b/doc/fixes34.2
index 22b4ac5c3..bea639d3e 100644
--- a/doc/fixes34.2
+++ b/doc/fixes34.2
@@ -2,6 +2,7 @@ $RCSfile$ $Revision$ $Date$
 
 General Fixes and Modified Features
 -----------------------------------
+avoid panic when secondary weapon is cursed while generating bones level
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/doc/fixes35.0 b/doc/fixes35.0
index 78d3375f5..15f244766 100644
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -3,6 +3,7 @@ $RCSfile$ $Revision$ $Date$
 General Fixes and Modified Features
 -----------------------------------
 setmangry should not be called when a monster enters a bones region
+avoid panic when secondary weapon is cursed while generating bones level
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/bones.c b/src/bones.c
index e4bd22837..827f52658 100644
--- a/src/bones.c
+++ b/src/bones.c
@@ -124,6 +124,7 @@ struct obj *cont;
 {
 	struct obj *otmp;
 
+	uswapwep = 0; /* ensure curse() won't cause swapwep to drop twice */
 	while ((otmp = invent) != 0) {
 		obj_extract_self(otmp);
 		obj_no_longer_held(otmp);