diff --git a/postfix/HISTORY b/postfix/HISTORY
index 39b8a5117..08ca49a46 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -13937,3 +13937,6 @@ Apologies for any names omitted.
 	Compatibility: as a migration tool, redirect attempts by
 	tlsmgr(8) or verify(8) to open files in non-Postfix directories
 	to the Postfix-owned data_directory. File: global/data_redirect.c.
+
+	Lots of pathname fixes in the examples of TLS_README and
+	postconf(5); -lm library screw-up in 8qmgr/Makefile.in.
diff --git a/postfix/README_FILES/TLS_README b/postfix/README_FILES/TLS_README
index db0ba5e2e..d26b04ed9 100644
--- a/postfix/README_FILES/TLS_README
+++ b/postfix/README_FILES/TLS_README
@@ -414,7 +414,7 @@ is high.
 Example:
 
     /etc/postfix/main.cf:
-        smtpd_tls_session_cache_database = btree:/etc/postfix/smtpd_scache
+        smtpd_tls_session_cache_database = btree:/var/lib/postfix/smtpd_scache
 
 Note: as of version 2.5, Postfix no longer uses root privileges when opening
 this file. The file should now be stored under the Postfix-owned
@@ -748,7 +748,7 @@ client is allowed to negotiate per unit time.
 Example:
 
     /etc/postfix/main.cf:
-        smtp_tls_session_cache_database = btree:/etc/postfix/smtp_scache
+        smtp_tls_session_cache_database = btree:/var/lib/postfix/smtp_scache
 
 Note: as of version 2.5, Postfix no longer uses root privileges when opening
 this file. The file should now be stored under the Postfix-owned
diff --git a/postfix/html/TLS_README.html b/postfix/html/TLS_README.html
index d8ce9fc5c..316dd3dd6 100644
--- a/postfix/html/TLS_README.html
+++ b/postfix/html/TLS_README.html
@@ -612,7 +612,7 @@ the cost of repeatedly negotiating TLS session keys is high.</p>
 <blockquote>
 <pre>
 /etc/postfix/<a href="postconf.5.html">main.cf</a>:
-    <a href="postconf.5.html#smtpd_tls_session_cache_database">smtpd_tls_session_cache_database</a> = btree:/etc/postfix/smtpd_scache
+    <a href="postconf.5.html#smtpd_tls_session_cache_database">smtpd_tls_session_cache_database</a> = btree:/var/lib/postfix/smtpd_scache
 </pre>
 </blockquote>
 
@@ -1079,7 +1079,7 @@ is allowed to negotiate per unit time.</p>
 <blockquote>
 <pre>
 /etc/postfix/<a href="postconf.5.html">main.cf</a>:
-    <a href="postconf.5.html#smtp_tls_session_cache_database">smtp_tls_session_cache_database</a> = btree:/etc/postfix/smtp_scache
+    <a href="postconf.5.html#smtp_tls_session_cache_database">smtp_tls_session_cache_database</a> = btree:/var/lib/postfix/smtp_scache
 </pre>
 </blockquote>
 
diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html
index cd525afc4..f7b62a18a 100644
--- a/postfix/html/postconf.5.html
+++ b/postfix/html/postconf.5.html
@@ -174,8 +174,8 @@ Examples:
 </p>
 
 <pre>
-<a href="postconf.5.html#address_verify_map">address_verify_map</a> = hash:/etc/postfix/verify
-<a href="postconf.5.html#address_verify_map">address_verify_map</a> = btree:/etc/postfix/verify
+<a href="postconf.5.html#address_verify_map">address_verify_map</a> = hash:/var/lib/postfix/verify
+<a href="postconf.5.html#address_verify_map">address_verify_map</a> = btree:/var/lib/postfix/verify
 </pre>
 
 <p>
@@ -9135,7 +9135,7 @@ under a non-Postfix directory is redirected to the Postfix-owned
 <p> Example: </p>
 
 <pre>
-<a href="postconf.5.html#smtp_tls_session_cache_database">smtp_tls_session_cache_database</a> = btree:/var/spool/postfix/smtp_scache
+<a href="postconf.5.html#smtp_tls_session_cache_database">smtp_tls_session_cache_database</a> = btree:/var/lib/postfix/smtp_scache
 </pre>
 
 <p> This feature is available in Postfix 2.2 and later.  </p>
@@ -11875,7 +11875,7 @@ under a non-Postfix directory is redirected to the Postfix-owned
 <p> Example: </p>
 
 <pre>
-<a href="postconf.5.html#smtpd_tls_session_cache_database">smtpd_tls_session_cache_database</a> = btree:/var/spool/postfix/smtpd_scache
+<a href="postconf.5.html#smtpd_tls_session_cache_database">smtpd_tls_session_cache_database</a> = btree:/var/lib/postfix/smtpd_scache
 </pre>
 
 <p> This feature is available in Postfix 2.2 and later.  </p>
diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5
index 5bef7fd80..b7588f118 100644
--- a/postfix/man/man5/postconf.5
+++ b/postfix/man/man5/postconf.5
@@ -110,8 +110,8 @@ Examples:
 .nf
 .na
 .ft C
-address_verify_map = hash:/etc/postfix/verify
-address_verify_map = btree:/etc/postfix/verify
+address_verify_map = hash:/var/lib/postfix/verify
+address_verify_map = btree:/var/lib/postfix/verify
 .fi
 .ad
 .ft R
@@ -5382,7 +5382,7 @@ Example:
 .nf
 .na
 .ft C
-smtp_tls_session_cache_database = btree:/var/spool/postfix/smtp_scache
+smtp_tls_session_cache_database = btree:/var/lib/postfix/smtp_scache
 .fi
 .ad
 .ft R
@@ -7263,7 +7263,7 @@ Example:
 .nf
 .na
 .ft C
-smtpd_tls_session_cache_database = btree:/var/spool/postfix/smtpd_scache
+smtpd_tls_session_cache_database = btree:/var/lib/postfix/smtpd_scache
 .fi
 .ad
 .ft R
diff --git a/postfix/proto/TLS_README.html b/postfix/proto/TLS_README.html
index b8c74141e..59ec1868f 100644
--- a/postfix/proto/TLS_README.html
+++ b/postfix/proto/TLS_README.html
@@ -612,7 +612,7 @@ the cost of repeatedly negotiating TLS session keys is high.</p>
 <blockquote>
 <pre>
 /etc/postfix/main.cf:
-    smtpd_tls_session_cache_database = btree:/etc/postfix/smtpd_scache
+    smtpd_tls_session_cache_database = btree:/var/lib/postfix/smtpd_scache
 </pre>
 </blockquote>
 
@@ -1079,7 +1079,7 @@ is allowed to negotiate per unit time.</p>
 <blockquote>
 <pre>
 /etc/postfix/main.cf:
-    smtp_tls_session_cache_database = btree:/etc/postfix/smtp_scache
+    smtp_tls_session_cache_database = btree:/var/lib/postfix/smtp_scache
 </pre>
 </blockquote>
 
diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto
index 8f8daa962..14fc2c884 100644
--- a/postfix/proto/postconf.proto
+++ b/postfix/proto/postconf.proto
@@ -195,8 +195,8 @@ Examples:
 </p>
 
 <pre>
-address_verify_map = hash:/etc/postfix/verify
-address_verify_map = btree:/etc/postfix/verify
+address_verify_map = hash:/var/lib/postfix/verify
+address_verify_map = btree:/var/lib/postfix/verify
 </pre>
 
 <p>
@@ -8499,7 +8499,7 @@ data_directory, and a warning is logged. </p>
 <p> Example: </p>
 
 <pre>
-smtpd_tls_session_cache_database = btree:/var/spool/postfix/smtpd_scache
+smtpd_tls_session_cache_database = btree:/var/lib/postfix/smtpd_scache
 </pre>
 
 <p> This feature is available in Postfix 2.2 and later.  </p>
@@ -8763,7 +8763,7 @@ data_directory, and a warning is logged. </p>
 <p> Example: </p>
 
 <pre>
-smtp_tls_session_cache_database = btree:/var/spool/postfix/smtp_scache
+smtp_tls_session_cache_database = btree:/var/lib/postfix/smtp_scache
 </pre>
 
 <p> This feature is available in Postfix 2.2 and later.  </p>
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 1d85f7598..03886b742 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE	"20071206"
+#define MAIL_RELEASE_DATE	"20071207"
 #define MAIL_VERSION_NUMBER	"2.5"
 
 #ifdef SNAPSHOT
diff --git a/postfix/src/oqmgr/Makefile.in b/postfix/src/oqmgr/Makefile.in
index fa59eaa52..599fdf89c 100644
--- a/postfix/src/oqmgr/Makefile.in
+++ b/postfix/src/oqmgr/Makefile.in
@@ -14,12 +14,12 @@ CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG= 
 PROG	= qmgr
 INC_DIR	= ../../include
-LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a -lm
+LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG):	$(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) -lm
 
 $(OBJS): ../../conf/makedefs.out
 
diff --git a/postfix/src/postconf/auto.awk b/postfix/src/postconf/auto.awk
index 18f60c797..4b888da51 100644
--- a/postfix/src/postconf/auto.awk
+++ b/postfix/src/postconf/auto.awk
@@ -29,4 +29,5 @@ BEGIN {
 	}
 	print "" > "auto_vars.h"
     }
+    exit(0)
 }
diff --git a/postfix/src/qmgr/Makefile.in b/postfix/src/qmgr/Makefile.in
index cd2ddc2f7..7858283fc 100644
--- a/postfix/src/qmgr/Makefile.in
+++ b/postfix/src/qmgr/Makefile.in
@@ -16,12 +16,12 @@ CFLAGS	= $(DEBUG) $(OPT) $(DEFS)
 TESTPROG= 
 PROG	= qmgr
 INC_DIR	= ../../include
-LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a -lm
+LIBS	= ../../lib/libmaster.a ../../lib/libglobal.a ../../lib/libutil.a
 
 .c.o:;	$(CC) $(CFLAGS) -c $*.c
 
 $(PROG):	$(OBJS) $(LIBS)
-	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS)
+	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(SYSLIBS) -lm
 
 $(OBJS): ../../conf/makedefs.out