diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 60b4e503..6287bf66 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-14  Marcus Brinkmann  <marcus@g10code.de>
+
+	* engine-gpgconf.c (gpgconf_config_load_cb): Fix program_name
+	field.
+
 2008-01-10  Marcus Brinkmann  <marcus@g10code.de>
 
 	* kdpipeiodevice.cpp: New version from Frank Osterfeld.
diff --git a/gpgme/engine-gpgconf.c b/gpgme/engine-gpgconf.c
index d562fdae..584bbea9 100644
--- a/gpgme/engine-gpgconf.c
+++ b/gpgme/engine-gpgconf.c
@@ -310,8 +310,8 @@ gpgconf_config_load_cb (void *hook, char *line)
 
   if (fields >= 3)
     {
-      comp->description = strdup (field[2]);
-      if (!comp->description)
+      comp->program_name = strdup (field[2]);
+      if (!comp->program_name)
 	return gpg_error_from_syserror ();
     }