diff --git a/scd/ChangeLog b/scd/ChangeLog
index 037090863..eb2074bba 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-26  Marcus Brinkmann  <marcus@g10code.de>
+
+	* scdaemon.c (main): For now, always print default filename for
+	--gpgconf-list, and never /dev/null.
+
 2004-04-21  Werner Koch  <wk@gnupg.org>
 
 	* command.c (scd_update_reader_status_file): Send a signal back to
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 5066a373b..d0306aeb6 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -538,7 +538,10 @@ main (int argc, char **argv )
     }
   
   if (gpgconf_list)
-    { /* List options and default values in the GPG Conf format.  */
+    {
+      char *filename;
+
+      /* List options and default values in the GPG Conf format.  */
 
       /* The following list is taken from gnupg/tools/gpgconf-comp.c.  */
       /* Option flags.  YOU MUST NOT CHANGE THE NUMBERS OF THE EXISTING
@@ -557,9 +560,10 @@ main (int argc, char **argv )
          a default, which is described by the value of the ARGDEF field.  */
 #define GC_OPT_FLAG_NO_ARG_DESC	(1UL << 6)
 
+      filename = make_filename (opt.homedir, "scdaemon.conf", NULL);
       printf ("gpgconf-scdaemon.conf:%lu:\"%s\n",
-              GC_OPT_FLAG_DEFAULT,
-              config_filename?config_filename:"/dev/null");
+              GC_OPT_FLAG_DEFAULT, filename);
+      xfree (filename);
         
       printf ("verbose:%lu:\n"
               "quiet:%lu:\n"