diff --git a/src/ChangeLog b/src/ChangeLog
index d3e77fcb..ca931a55 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-02  Werner Koch  <wk@g10code.com>
+
+	* gpgconf.c (gpgme_conf_arg_release): No return in a function
+	returning void.  Reported by Wyllys Ingersoll.
+
 2009-12-01  Werner Koch  <wk@g10code.com>
 
 	* gpgme-tool.c (cmd_getauditlog): Add flag --html.
diff --git a/src/gpgconf.c b/src/gpgconf.c
index 9fa2ce9e..8fdf68ee 100644
--- a/src/gpgconf.c
+++ b/src/gpgconf.c
@@ -59,7 +59,7 @@ void
 gpgme_conf_arg_release (gpgme_conf_arg_t arg, gpgme_conf_type_t type)
 {
 #ifdef ENABLE_GPGCONF
-  return _gpgme_conf_arg_release (arg, type);
+  _gpgme_conf_arg_release (arg, type);
 #endif
 }