diff --git a/src/ChangeLog b/src/ChangeLog
index 5fa5ec94..279f52c7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-26  Steven Schubiger  <schubiger@gmail.com>
+
+	* ftp.c (getftp): Replace last remaining invocation of escnonprint
+	with gnulib quote.
+
 2008-05-19  Micah Cowan  <micah@cowan.name>
 
 	* main.c (main): Password prompt should be done only once (not
diff --git a/src/ftp.c b/src/ftp.c
index 17df5029..7256faa3 100644
--- a/src/ftp.c
+++ b/src/ftp.c
@@ -808,8 +808,8 @@ Error in server response, closing control connection.\n"));
 	      if (!exists)
 		{
 		  logputs (LOG_VERBOSE, "\n");
-		  logprintf (LOG_NOTQUIET, _("No such file `%s'.\n"),
-			     escnonprint (u->file));
+		  logprintf (LOG_NOTQUIET, _("No such file %s.\n"),
+			     quote (u->file));
 		}
 	    }
           fd_close (csock);