--- src/randart.c.orig	2005-12-14 18:13:06.000000000 -0500
+++ src/randart.c	2007-03-17 17:26:00.000000000 -0400
@@ -372,15 +372,26 @@
 			strcpy(dummy_name, "");
 			object_out_desc(o_ptr, NULL, FALSE, TRUE);
 
-			if (get_string("What do you want to call the artifact? ", dummy_name, 80))
+			if (!get_string("What do you want to call the artifact? ", dummy_name, 80) ||
+			    strlen(dummy_name) == 0)
+			{
+				/* Default name = of 'player name' */
+				strcpy(new_name, "of ");
+				strcat(new_name, player_name);
+			}
+			else if ((strncmp(dummy_name, "of ", 3) == 0) ||
+				 (strncmp(dummy_name, "Of ", 3) == 0) ||
+				 ((dummy_name[0] == '\'') &&
+				  (dummy_name[strlen(dummy_name) - 1] == '\'')))
+			{
+				strcpy(new_name, dummy_name);
+			}
+			else
 			{
 				strcpy(new_name, "called '");
 				strcat(new_name, dummy_name);
 				strcat(new_name, "'");
 			}
-			else
-				/* Default name = of 'player name' */
-				sprintf(new_name, "of '%s'", player_name);
 		}
 		else
 		{