diff --git a/tools/ChangeLog b/tools/ChangeLog
index 4d520cfca..e39dd3b04 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-09  Werner Koch  <wk@g10code.com>
+
+	* gpgconf-comp.c <dirmngr>: Add honor-http-proxy.
+
 2005-02-25  Werner Koch  <wk@g10code.com>
 
 	* no-libgcrypt.c (gcry_strdup): New.
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index e4758c1e6..dd35d3701 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -746,6 +746,9 @@ static gc_option_t gc_options_dirmngr[] =
    { "http-proxy", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
      "dirmngr", "|URL|redirect all HTTP requests to URL",
      GC_ARG_TYPE_STRING, GC_BACKEND_DIRMNGR },
+   { "honor-http-proxy", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
+     "dirmngr", N_("use system's HTTP proxy setting"),
+     GC_ARG_TYPE_STRING, GC_BACKEND_DIRMNGR },
 
    { "LDAP",
      GC_OPT_FLAG_GROUP, GC_LEVEL_BASIC,