diff --git a/doc/fixes34.1 b/doc/fixes34.1
index e26d6ce53..1e4f78e30 100644
--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -258,6 +258,8 @@ with multiple leashes in use, 2nd had 50/50 chance of having unbounded length
 GOLDOBJ: coins aren't subject to curses/blesses and don't need identification
 can no longer activate a figurine while engulfed
 can't use figurines to get too many erinyes or Nazgul
+include currently wielded weapon among the list of likely choices for 'w'
+likewise for currently quivered ammo among choices for 'Q'
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/invent.c b/src/invent.c
index 4ef66089b..bf0a58c5e 100644
--- a/src/invent.c
+++ b/src/invent.c
@@ -829,10 +829,12 @@ register const char *let,*word;
 		|| (putting_on(word) &&
 		     (otmp->owornmask & (W_ARMOR | W_RING | W_AMUL | W_TOOL)))
 							/* already worn */
+#if 0	/* 3.4.1 -- include currently wielded weapon among the choices */
 		|| (!strcmp(word, "wield") &&
 		    (otmp->owornmask & W_WEP))
+#endif
 		|| (!strcmp(word, "ready") &&
-		    (otmp->owornmask & (W_WEP | W_SWAPWEP | W_QUIVER)))
+		    (otmp == uwep || (otmp == uswapwep && u.twoweap)))
 		    ) {
 			foo--;
 			foox++;