diff --git a/util/ChangeLog b/util/ChangeLog
index aaf88f43e..dd7b85fa4 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-19  David Shaw  <dshaw@jabberwocky.com>
+
+	* http.c (send_request): A zero length proxy is the same as no
+	proxy.
+
 2006-02-14  Werner Koch  <wk@gnupg.org>
 
 	* errors.c (g10_errstr): Add NO_DATA.
diff --git a/util/http.c b/util/http.c
index 90a6005eb..b5dc682e4 100644
--- a/util/http.c
+++ b/util/http.c
@@ -518,7 +518,7 @@ send_request( HTTP_HD hd, const char *auth, const char *proxy )
     server = *hd->uri->host? hd->uri->host : "localhost";
     port   = hd->uri->port?  hd->uri->port : 80;
 
-    if(proxy)
+    if(proxy && *proxy)
       {
 	PARSED_URI uri;