diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 4d6813778..e43553ddb 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-20  David Shaw  <dshaw@jabberwocky.com>
+
+	* curl-shim.c (curl_easy_perform): Minor cleanup of proxy code.
+
 2006-07-16  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpgkeys_hkp.c (send_key), gpgkeys_ldap.c (send_key,
diff --git a/keyserver/curl-shim.c b/keyserver/curl-shim.c
index 8c7c36539..f4fdc0c60 100644
--- a/keyserver/curl-shim.c
+++ b/keyserver/curl-shim.c
@@ -164,13 +164,11 @@ curl_easy_perform(CURL *curl)
   /* Emulate the libcurl proxy behavior.  If the calling program set a
      proxy, use it.  If it didn't set a proxy or set it to NULL, check
      for one in the environment.  If the calling program explicitly
-     set a null-string proxy, don't set a proxy at all. */
+     set a null-string proxy the http code doesn't use a proxy at
+     all. */
 
   if(curl->proxy)
-    {
-      if(*curl->proxy)
-	proxy=curl->proxy;
-    }
+    proxy=curl->proxy;
   else
     proxy=getenv(HTTP_PROXY_ENV);