diff --git a/tools/ChangeLog b/tools/ChangeLog
index 57c52f437..084028c15 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,5 +1,8 @@
 2004-02-26  Marcus Brinkmann  <marcus@g10code.de>
 
+	* gpgconf-comp.c (retrieve_options_from_program): Remove broken
+	string handling.
+
 	* gpgconf-comp.c (change_options_program): Support all types of
 	options, including list types.
 
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 3b9927f61..e56f9c49f 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -1084,12 +1084,6 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend)
 		    {
 		      char *opt_val = opt_value;
 
-		      if (gc_arg_type[option->arg_type].fallback
-			  == GC_ARG_TYPE_STRING)
-			opt_val++;
-
-		      /* FIXME.  For type none arguments, this is
-			 wrong.  */
 		      option->value = xasprintf ("%s,%s", option->value,
 						 opt_val);
 		      xfree (opt_value);