diff --git a/src/ChangeLog b/src/ChangeLog
index 5ba66906..3df8ddae 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-24  Steven Schubiger  <stsc@members.fsf.org>
+
+	* http.c (http_loop): Replace escnonprint() occurence with
+	a quotearg_style() call.
+
 2008-06-24  Micah Cowan  <micah@cowan.name>
 
 	* ftp-ls.c (ftp_index): Don't assume time_t* is compatible with
diff --git a/src/http.c b/src/http.c
index f79b1e7a..113e096a 100644
--- a/src/http.c
+++ b/src/http.c
@@ -2704,7 +2704,7 @@ Remote file exists.\n\n"));
                       logprintf (LOG_NONVERBOSE, 
                                  _("%s URL:%s %2d %s\n"), 
                                  tms, u->url, hstat.statcode,
-                                 hstat.message ? escnonprint (hstat.message) : "");
+                                 hstat.message ? quotearg_style (escape_quoting_style, hstat.message) : "");
                       goto exit;
                     }
                 }