diff --git a/scd/ChangeLog b/scd/ChangeLog
index 51db189fa..ad3b211f6 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-09  Marcus Brinkmann  <marcus@g10code.de>
+
+	* scdaemon.c (main): Use CONFIG_FILENAME as filename if it is set
+	in gpgconf-list output.
+
 2007-12-10  Werner Koch  <wk@g10code.com>
 
 	* app-openpgp.c (do_decipher): Take care of cryptograms shorter
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 8b5b7dcd7..a8a3bcff5 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -555,8 +555,10 @@ main (int argc, char **argv )
       char *filename = NULL;
       char *filename_esc;
 
-      if (!config_filename)
-        filename = make_filename (opt.homedir, "scdaemon.conf", NULL );
+      if (config_filename)
+	filename = xstrdup (config_filename);
+      else
+        filename = make_filename (opt.homedir, "scdaemon.conf", NULL);
       filename_esc = percent_escape (filename, NULL);
 
       printf ("gpgconf-scdaemon.conf:%lu:\"%s\n",