diff --git a/doc/fixes34.1 b/doc/fixes34.1
index 09c926a55..12db520d0 100644
--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -326,6 +326,7 @@ not all cavemen are human, so avoid using human in quest messages
 tengu is singular and plural, some rumors were incorrect
 don't let leader or nemesis be renamed
 non-moving monster are not affected by liquid
+'A' command wouldn't remove cursed item from quiver or alternate weapon slot
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/do_wear.c b/src/do_wear.c
index 32f16b40d..84a76464d 100644
--- a/src/do_wear.c
+++ b/src/do_wear.c
@@ -1,4 +1,4 @@
-/*	SCCS Id: @(#)do_wear.c	3.4	2002/09/30	*/
+/*	SCCS Id: @(#)do_wear.c	3.4	2002/11/29	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -1652,6 +1652,7 @@ register struct obj *otmp;
 	if (!otmp) return 0;
 	*buf = '\0';			/* lint suppresion */
 
+	/* special ring checks */
 	if (otmp == uright || otmp == uleft) {
 	    if (nolimbs(youmonst.data)) {
 		pline_The("ring is stuck.");
@@ -1671,6 +1672,7 @@ register struct obj *otmp;
 		return 0;
 	    }
 	}
+	/* special glove checks */
 	if (otmp == uarmg) {
 	    if (welded(uwep)) {
 		You("are unable to take off your %s while wielding that %s.",
@@ -1683,6 +1685,7 @@ register struct obj *otmp;
 		return 0;
 	    }
 	}
+	/* special boot checks */
 	if (otmp == uarmf) {
 	    if (u.utrap && u.utraptype == TT_BEARTRAP) {
 		pline_The("bear trap prevents you from pulling your %s out.",
@@ -1694,6 +1697,7 @@ register struct obj *otmp;
 		return 0;
 	    }
 	}
+	/* special suit and shirt checks */
 	if (otmp == uarm
 #ifdef TOURIST
 			|| otmp == uarmu
@@ -1720,8 +1724,13 @@ register struct obj *otmp;
 		return 0;
 	    }
 	}
-	/* fundamental, but other impediments are checked first */
-	if (cursed(otmp)) return 0;
+	/* basic curse check */
+	if (otmp == uquiver || (otmp == uswapwep && !u.twoweap)) {
+	    ;	/* some items can be removed even when cursed */
+	} else {
+	    /* otherwise, this is fundamental */
+	    if (cursed(otmp)) return 0;
+	}
 
 	if(otmp == uarm) takeoff_mask |= WORN_ARMOR;
 	else if(otmp == uarmc) takeoff_mask |= WORN_CLOAK;