diff --git a/doc/fixes34.1 b/doc/fixes34.1
index 31a1ed133..007fe358d 100644
--- a/doc/fixes34.1
+++ b/doc/fixes34.1
@@ -122,6 +122,7 @@ specifying -D (or -X) to enter explore mode while restarting from a save
 fix crash when using lookat on an known invisible monster with monster syms set
 prevent getting stuck in infinite loop when using wizard mode #levelchange
 	command to reduce level while having level-drain resistance
+naming an already wielded elven dagger "Sting" activates warning against orcs
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/do_name.c b/src/do_name.c
index 193863bd5..b5757b23d 100644
--- a/src/do_name.c
+++ b/src/do_name.c
@@ -1,4 +1,4 @@
-/*	SCCS Id: @(#)do_name.c	3.4	2002/01/17	*/
+/*	SCCS Id: @(#)do_name.c	3.4	2002/06/24	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -421,7 +421,12 @@ const char *name;
 			      (genericptr_t)obj->oextra, lth, name);
 	}
 	if (lth) artifact_exists(obj, name, TRUE);
-	if (obj->oartifact && obj == uswapwep) untwoweapon();
+	if (obj->oartifact) {
+	    /* can't dual-wield with artifact as secondary weapon */
+	    if (obj == uswapwep) untwoweapon();
+	    /* activate warning if you've just named your weapon "Sting" */
+	    if (obj == uwep) set_artifact_intrinsic(obj, TRUE, W_WEP);
+	}
 	if (carried(obj)) update_inventory();
 	return obj;
 }