7 files changed, 29 insertions, 5 deletions
diff --git a/imap/.gitignore b/imap/.gitignore
index 2c8f7fa..b97dbfc 100644
--- a/imap/.gitignore
+++ b/imap/.gitignore
@@ -8,11 +8,13 @@
 /courierpop3d.html.in
 /imapd
 /imapd-ssl.dist
+/imapd-ssl.dist.in
 /imapd.8
 /imapd.8.in
 /imapd.cnf
 /imapd.cnf.openssl
 /imapd.dist
+/imapd.dist.in
 /imapd.html
 /imapd.html.in
 /imapd.pam
@@ -38,9 +40,11 @@
 /mkpop3dcert.html.in
 /pop3d
 /pop3d-ssl.dist
+/pop3d-ssl.dist.in
 /pop3d.cnf
 /pop3d.cnf.openssl
 /pop3d.dist
+/pop3d.dist.in
 /pop3d.pam
 /pop3login
 /testsuitefix.pl
diff --git a/imap/Makefile.am b/imap/Makefile.am
index bd68261..7a08790 100644
--- a/imap/Makefile.am
+++ b/imap/Makefile.am
@@ -139,6 +139,15 @@ courierpop3d.8: courierpop3d.8.in
 	./config.status --file=courierpop3d.8
 
 if HAVE_SGML
+
+GITFILES=imapd.dist.in imapd-ssl.dist.in pop3d.dist.in pop3d-ssl.dist.in
+
+BUILT_SOURCES += $(GITFILES)
+
+$(GITFILES): %: %.git
+	perl -p -e 's/\$$Id:[^\$$]*/\$$Id: '"`git log --pretty=format:\"%H\" -n 1 -- $<`-`date +%Y%m%d%H%M%S`/" <$< >$@.tmp
+	mv -f $@.tmp $@
+
 imapd.html.in: imapd.sgml ../docbook/sgml2html
 	../docbook/sgml2html imapd.sgml imapd.html.in
 
diff --git a/imap/configure.ac b/imap/configure.ac
index df67887..972cd26 100644
--- a/imap/configure.ac
+++ b/imap/configure.ac
@@ -313,6 +313,17 @@ fi
 
 AM_CONDITIONAL(HAVE_SGML, test -d ${srcdir}/../docbook)
 
+# This gets built by the make rule, and is not in the git repo
+
+for f in imapd.dist.in imapd-ssl.dist.in pop3d.dist.in pop3d-ssl.dist.in
+do
+    if test ! -f "$srcdir/$f"
+    then
+	cp -p "$srcdir/$f.git" "$srcdir/$f"
+	touch "$srcdir/$f.git"
+    fi
+done
+
 AC_SUBST(target_cpu)
 AC_SUBST(target_vendor)
 AC_SUBST(target_os)
diff --git a/imap/imapd-ssl.dist.in b/imap/imapd-ssl.dist.in.git
index bd531d7..b0d68bc 100644
--- a/imap/imapd-ssl.dist.in
+++ b/imap/imapd-ssl.dist.in.git
@@ -54,7 +54,7 @@ SSLPIDFILE=@piddir@/imapd-ssl.pid
 
 ##NAME: SSLLOGGEROPTS:0
 #
-# courierlogger(1) options.                                        
+# courierlogger(1) options.
 #
 
 SSLLOGGEROPTS="-name=imapd-ssl"
@@ -131,7 +131,7 @@ COURIERTLS=@bindir@/couriertls
 # documentation.
 
 ##NAME: TLS_PROTOCOL:0
-# 
+#
 # TLS_PROTOCOL sets the protocol version.  The possible versions are:
 #
 # OpenSSL:
@@ -178,7 +178,7 @@ COURIERTLS=@bindir@/couriertls
 # documentation.
 
 ##NAME: TLS_STARTTLS_PROTOCOL:0
-# 
+#
 # TLS_STARTTLS_PROTOCOL is used instead of TLS_PROTOCOL for the IMAP STARTTLS
 # extension, as opposed to IMAP over SSL on port 993.
 #
diff --git a/imap/imapd.dist.in b/imap/imapd.dist.in.git
index 08ecd69..08ecd69 100644
--- a/imap/imapd.dist.in
+++ b/imap/imapd.dist.in.git
diff --git a/imap/pop3d-ssl.dist.in b/imap/pop3d-ssl.dist.in.git
index 8fdf5a2..9e81ee8 100644
--- a/imap/pop3d-ssl.dist.in
+++ b/imap/pop3d-ssl.dist.in.git
@@ -52,7 +52,7 @@ SSLPIDFILE=@piddir@/pop3d-ssl.pid
 
 ##NAME: SSLLOGGEROPTS:0
 #
-# courierlogger(1) options.                                        
+# courierlogger(1) options.
 #
 
 SSLLOGGEROPTS="-name=pop3d-ssl"
@@ -116,7 +116,7 @@ COURIERTLS=@bindir@/couriertls
 # documentation.
 
 ##NAME: TLS_PROTOCOL:0
-# 
+#
 # TLS_PROTOCOL sets the protocol version.  The possible versions are:
 #
 # OpenSSL:
diff --git a/imap/pop3d.dist.in b/imap/pop3d.dist.in.git
index b3ab118..b3ab118 100644
--- a/imap/pop3d.dist.in
+++ b/imap/pop3d.dist.in.git