diff --git a/Makefile.in b/Makefile.in
index 5e4396e789..a1c03872a5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,6 +40,9 @@ install-conf:
 			< $$i > $(sysconfdir)/$$i; \
 		chmod 0644 $(sysconfdir)/$$i; \
 		file=`echo $$i|sed s/-dist//`; \
+		if [ "$$file" = "httpd.conf" ]; then \
+			file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
+		fi; \
 		if test "$$file" != "$$i" && test ! -f $(sysconfdir)/$$file; then \
 			$(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \
 		fi; \
diff --git a/configure.in b/configure.in
index 3a2a4a741f..f707238af7 100644
--- a/configure.in
+++ b/configure.in
@@ -165,12 +165,13 @@ echo $MODLIST | $AWK -f $srcdir/helpers/build-modules-c.awk > $srcdir/modules.c
 AC_ARG_WITH(program-name,
 [  --with-program-name=alternate executable name],[
   progname="$withval" ], [
-  progname='httpd'] )
+  progname="httpd"] )
 
 AC_OUTPUT_COMMANDS([
 echo '/* Generated by configure */' > ${path_h}.new
 echo "#define HTTPD_ROOT \"$prefix\"" >> ${path_h}.new
 echo "#define SUEXEC_BIN \"$bindir/suexec\"" >> ${path_h}.new
+echo "#define SERVER_CONFIG_FILE \"conf/$progname.conf\"" >> ${path_h}.new
 
 cmp ${path_h}.new ${path_h} >/dev/null 2>&1
 if test $? -ne 0 ; then
@@ -185,6 +186,7 @@ path_h=./include/ap_config_path.h
 prefix=$prefix
 exec_prefix=$exec_prefix
 bindir=$bindir
+progname=$progname
 ])
 
 AC_OUTPUT($APACHE_OUTPUT_FILES Makefile)