diff --git a/tools/ChangeLog b/tools/ChangeLog
index 077115a58..1489eb051 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -2,6 +2,7 @@
 
 	* gpgconf-comp.c (gc_component_change_options): Set the filenames
 	of the option's backend, not of the component.
+	Also use GC_BACKEND_NR, not GC_COMPONENT_NR.
 
 2004-03-09  Werner Koch  <wk@gnupg.org>
 
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index d792d1d75..a55883e55 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -2057,7 +2057,7 @@ gc_component_change_options (int component, FILE *in)
     {
       int i;
 
-      for (i = 0; i < GC_COMPONENT_NR; i++)
+      for (i = 0; i < GC_BACKEND_NR; i++)
 	{
 	  if (src_pathname[i])
 	    {
@@ -2089,7 +2089,7 @@ gc_component_change_options (int component, FILE *in)
       int saved_errno = errno;
 
       /* An error occured.  */
-      for (i = 0; i < GC_COMPONENT_NR; i++)
+      for (i = 0; i < GC_BACKEND_NR; i++)
 	{
 	  if (src_pathname[i])
 	    {