diff --git a/configure.ac b/configure.ac
index 9fd35942..9385801a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -397,4 +397,9 @@ echo "  exec_prefix             $exec_prefix"
 echo "  libdir                  $libdir"
 echo "  bindir                  $bindir"
 echo "  sysconfdir              $sysconfdir"
-echo "#define CONFIGURE_STRING \"$@\"" > configure_params.h
+
+# configure_params.h will be written to the build directory, not the source directory
+echo '#define CONFIGURE_STRING \' > ./configure_params.h
+./config.status --config | xargs -n 1 | sed -e 's/^/"      /' -e 's/$/\\n" \\/' >> ./configure_params.h
+echo '""' >> ./configure_params.h
+
diff --git a/xrdp/xrdp.c b/xrdp/xrdp.c
index a5293896..fec1385a 100644
--- a/xrdp/xrdp.c
+++ b/xrdp/xrdp.c
@@ -56,17 +56,20 @@ print_version(void)
                 "Neutrino Labs, and all contributors.");
     g_writeln("  See https://github.com/neutrinolabs/xrdp for more information.");
     g_writeln("%s", "");
+
+#if defined(CONFIGURE_STRING)
+    g_writeln("  Configure options:");
+    g_writeln("%s", CONFIGURE_STRING);
+#endif
+
     g_writeln("  Compiled with %s", get_openssl_version());
+
 }
 
 /*****************************************************************************/
 void
 print_help(void)
 {
-#if defined(CONFIGURE_STRING)
-    g_writeln("xrdp configure command line parameters [%s]", CONFIGURE_STRING);
-    g_writeln("%s", "");
-#endif
     g_writeln("Usage: xrdp [options]");
     g_writeln("   -h, --help       show help");
     g_writeln("   -n, --nodaemon   don't fork into background");