diff --git a/doc/fixes34.4 b/doc/fixes34.4
index 0ab5916b6..d4459f37f 100644
--- a/doc/fixes34.4
+++ b/doc/fixes34.4
@@ -158,6 +158,10 @@ adjust message for gas effect from chest trap if hero resists hallucination
 cancelling non-shop objects in a shop's entrance would upset the shopkeeper
 identified touchstone can rub on gold like the data.base entry says
 restore the capability of rubbing any object against known touchstone
+tombstone's reason for death after being killed by mis-returning Mjollnir
+	varied depending upon whether it was fully identified
+tombstone's reason for death from kicking an object could include so much
+	detail about the object that is was too verbose
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/dokick.c b/src/dokick.c
index 7d42a1457..6c86d60e0 100644
--- a/src/dokick.c
+++ b/src/dokick.c
@@ -1,4 +1,4 @@
-/*	SCCS Id: @(#)dokick.c	3.5	2005/06/22	*/
+/*	SCCS Id: @(#)dokick.c	3.5	2005/12/02	*/
 /* Copyright (c) Izchak Miller, Mike Stephenson, Steve Linhart, 1989. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -603,7 +603,7 @@ char *buf;
 {
 	const char *what;
 
-	if (kickobj) what = distant_name(kickobj,doname);
+	if (kickobj) what = killer_xname(kickobj);
 	else if (IS_DOOR(maploc->typ)) what = "a door";
 	else if (IS_TREE(maploc->typ)) what = "a tree";
 	else if (IS_STWALL(maploc->typ)) what = "a wall";
diff --git a/src/dothrow.c b/src/dothrow.c
index 4db1307f4..024201022 100644
--- a/src/dothrow.c
+++ b/src/dothrow.c
@@ -1,4 +1,4 @@
-/*	SCCS Id: @(#)dothrow.c	3.5	2005/09/04	*/
+/*	SCCS Id: @(#)dothrow.c	3.5	2005/12/02	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -1068,8 +1068,8 @@ boolean twoweap; /* used to restore twoweapon mode if wielded weapon returns */
 				  body_part(ARM));
 			    (void) artifact_hit((struct monst *)0,
 						&youmonst, obj, &dmg, 0);
-			    losehp(Maybe_Half_Phys(dmg), xname(obj),
-				obj_is_pname(obj) ? KILLED_BY : KILLED_BY_AN);
+			    losehp(Maybe_Half_Phys(dmg),
+				   killer_xname(obj), KILLED_BY);
 			}
 			if (ship_object(obj, u.ux, u.uy, FALSE)) {
 		    	    thrownobj = (struct obj*)0;