diff --git a/ChangeLog b/ChangeLog
index cd561e040..d32ffc28b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2002-09-19  Richard Frith-Macdonald <rfm@gnu.org>
 
+	* Source/GSFormat.m: Where a %p format prints a null pointer,
+	print the text (null).
 	* Source/GSTcpHandle.m: Check port for invalidation while looping
 	on write events, so we can fail if we become invalid while sending
 	or connecting, before the port timeout expires.
diff --git a/Source/GSFormat.m b/Source/GSFormat.m
index 865e6562a..661a3de8b 100644
--- a/Source/GSFormat.m
+++ b/Source/GSFormat.m
@@ -1649,14 +1649,8 @@ NSDictionary *locale)
 	  }
 	else
 	  {
-	    unichar nil_name[] = {'(','n','i','l',')','\0'};
-	    /* Write "(nil)" for a nil pointer.  */
-	    string = nil_name;
-	    /* Make sure the full string "(nil)" is printed.  */
-	    if (prec < 5)
-	      prec = 5;
-	    string_malloced = 0;
-	    goto LABEL (print_uni_string);
+	    string = NULL;
+	    goto LABEL (print_string);
 	  }
       }
       /* NOTREACHED */
@@ -1788,7 +1782,6 @@ NSDictionary *locale)
 	    while (prc--) *sp = *wsp;
 	  }
 
-	LABEL (print_uni_string):
 	if ((width -= len) <= 0)
 	  {
 	    outstring (string, len);