diff --git a/tools/ChangeLog b/tools/ChangeLog
index ebdc94eaf..077115a58 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-12  Marcus Brinkmann  <marcus@g10code.de>
+
+	* gpgconf-comp.c (gc_component_change_options): Set the filenames
+	of the option's backend, not of the component.
+
 2004-03-09  Werner Koch  <wk@gnupg.org>
 
 	* gpgconf-comp.c [_riscos_]: Removed special code for RISC OS; we
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 791839a4d..d792d1d75 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -2029,7 +2029,8 @@ gc_component_change_options (int component, FILE *in)
     {
       /* Go on if we have already seen this backend, or if there is
 	 nothing to do.  */
-      if (src_pathname[option->backend] || !(option->new_flags || option->new_value))
+      if (src_pathname[option->backend]
+	  || !(option->new_flags || option->new_value))
 	{
 	  option++;
 	  continue;
@@ -2037,14 +2038,14 @@ gc_component_change_options (int component, FILE *in)
 
       if (gc_backend[option->backend].program)
 	err = change_options_program (component, option->backend,
-				      &src_pathname[component],
-				      &dest_pathname[component],
-				      &orig_pathname[component]);
+				      &src_pathname[option->backend],
+				      &dest_pathname[option->backend],
+				      &orig_pathname[option->backend]);
       else
 	err = change_options_file (component, option->backend,
-				   &src_pathname[component],
-				   &dest_pathname[component],
-				   &orig_pathname[component]);
+				   &src_pathname[option->backend],
+				   &dest_pathname[option->backend],
+				   &orig_pathname[option->backend]);
 	
       if (err)
 	break;