diff --git a/scd/ChangeLog b/scd/ChangeLog
index eb2074bba..3aea9f08d 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-26  Werner Koch  <wk@gnupg.org>
+
+	* scdaemon.c (main): Do the last change the usual way. This is so
+	that we can easily test for versioned config files above.
+
 2004-04-26  Marcus Brinkmann  <marcus@g10code.de>
 
 	* scdaemon.c (main): For now, always print default filename for
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index d0306aeb6..5e9737ae4 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -539,8 +539,6 @@ main (int argc, char **argv )
   
   if (gpgconf_list)
     {
-      char *filename;
-
       /* List options and default values in the GPG Conf format.  */
 
       /* The following list is taken from gnupg/tools/gpgconf-comp.c.  */
@@ -559,11 +557,11 @@ main (int argc, char **argv )
       /* The NO_ARG_DESC flag for an option indicates that the argument has
          a default, which is described by the value of the ARGDEF field.  */
 #define GC_OPT_FLAG_NO_ARG_DESC	(1UL << 6)
+      if (!config_filename)
+        config_filename = make_filename (opt.homedir, "scdaemon.conf", NULL );
 
-      filename = make_filename (opt.homedir, "scdaemon.conf", NULL);
       printf ("gpgconf-scdaemon.conf:%lu:\"%s\n",
-              GC_OPT_FLAG_DEFAULT, filename);
-      xfree (filename);
+              GC_OPT_FLAG_DEFAULT, config_filename);
         
       printf ("verbose:%lu:\n"
               "quiet:%lu:\n"
diff --git a/sm/ChangeLog b/sm/ChangeLog
index 6c3ff32fb..aaf5d9047 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,5 +1,8 @@
 2004-04-26  Werner Koch  <wk@gnupg.org>
 
+	* gpgsm.c (main) <gpgconf>: Do not use /dev/null as default config
+	filename.
+
 	* call-agent.c (gpgsm_agent_pksign, gpgsm_agent_pkdecrypt) 
 	(gpgsm_agent_genkey, gpgsm_agent_istrusted) 
 	(gpgsm_agent_marktrusted, gpgsm_agent_havekey) 
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index eff167367..33d8a2c48 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -1294,9 +1294,11 @@ 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)
 
+        if (!config_filename)
+          config_filename = make_filename (opt.homedir, "gpgsm.conf", NULL);
+
         printf ("gpgconf-gpgsm.conf:%lu:\"%s\n",
-                GC_OPT_FLAG_DEFAULT,
-                config_filename?config_filename:"/dev/null");
+                GC_OPT_FLAG_DEFAULT, config_filename);
         
         printf ("verbose:%lu:\n"
                 "quiet:%lu:\n"