diff --git a/LOG b/LOG
index dd698aa88d..8fc057b555 100644
--- a/LOG
+++ b/LOG
@@ -623,3 +623,12 @@
   added a note to BUILDING that CHEZSCHEMELIBDIRS should be unset in
   Version 9.5 and before.
     s/Mf-base, mats/Mf-base, BUILDING
+- Updated CSUG to replace \INSERTREVISIONMONTHSPACEYEAR with the current
+  month and year at the time of generation.
+    csug.stex, copyright.stex
+- Updated configuration to set machine types in the CSUG and release notes 
+  make files, and updated distclean target to remove these files.
+    configure, makefiles/Makefile-csug.in (renamed from csug/Makefile),
+    makefiles/Makefile-release_notes.in
+      (renamed from release_notes/Makefile),
+    makefiles/Makefile
diff --git a/configure b/configure
index 4f035e38bc..8fa2aaeda1 100755
--- a/configure
+++ b/configure
@@ -332,6 +332,12 @@ sed -e 's/$(m)/'$m'/g'\
     -e 's/$(workarea)/'$w'/g'\
   makefiles/Makefile.in > Makefile
 
+sed -e 's/$(m)/'$m'/g'\
+    makefiles//Makefile-csug.in > csug/Makefile
+
+sed -e 's/$(m)/'$m'/g'\
+    makefiles//Makefile-release_notes.in > release_notes/Makefile
+
 cat makefiles/Makefile-workarea.in > $w/Makefile
 
 sed -e 's/$(m)/'$m'/g'\
diff --git a/csug/copyright.stex b/csug/copyright.stex
index 40ab14eeda..8592f6edb4 100644
--- a/csug/copyright.stex
+++ b/csug/copyright.stex
@@ -22,7 +22,7 @@ Licensed under the Apache License Version 2.0\\
 http://www.apache.org/licenses/LICENSE-2.0
 
 % NB: also update corresponding notice in csug.stex
-Revised \INSERTREVISIONMONTHSPACEYEAR for Chez Scheme Version 9.5.1.
+Revised \revisiondate~for Chez Scheme Version 9.5.1.
 
 \medskip\noindent
 Cisco and the Cisco logo are trademarks or registered trademarks
diff --git a/csug/csug.stex b/csug/csug.stex
index f383ddee7a..9e3836d38b 100644
--- a/csug/csug.stex
+++ b/csug/csug.stex
@@ -22,6 +22,25 @@
 (case-sensitive #t)
 \endschemeinit
 
+\generated
+(let ([d (current-date)])
+  (printf "\\def\\revisiondate{~a ~d}"
+    (case (date-month d)
+      [(1) "January"]
+      [(2) "February"]
+      [(3) "March"]
+      [(4) "April"]
+      [(5) "May"]
+      [(6) "June"]
+      [(7) "July"]
+      [(8) "August"]
+      [(9) "September"]
+      [(10) "October"]
+      [(11) "November"]
+      [(12) "December"])
+    (date-year d)))
+\endgenerated
+
 \iflatex
 \usepackage{graphicx}
 \usepackage{color}
@@ -44,7 +63,7 @@
 Copyright &copy; 2017 Cisco Systems, Inc.<br>
 Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License Version 2.0</a>
 (<a class=plain href="canned/copyright.html">full copyright notice.</a>).</br>
-Revised \INSERTREVISIONMONTHSPACEYEAR for Chez Scheme Version 9.5.1<br>
+Revised} \revisiondate\raw{ for Chez Scheme Version 9.5.1<br>
 <a class=plain href="canned/about.html">about this book</a>
 </tr></table>
 }}
diff --git a/csug/Makefile b/makefiles/Makefile-csug.in
similarity index 99%
rename from csug/Makefile
rename to makefiles/Makefile-csug.in
index 684e4529df..8254e67130 100644
--- a/csug/Makefile
+++ b/makefiles/Makefile-csug.in
@@ -1,4 +1,4 @@
-m = a6le
+m = $(m)
 Scheme=../$m/bin/$m/scheme -b ../$m/boot/$m/petite.boot -b ../$m/boot/$m/scheme.boot
 STEXLIB=../stex
 installdir=/tmp/csug9
diff --git a/release_notes/Makefile b/makefiles/Makefile-release_notes.in
similarity index 99%
rename from release_notes/Makefile
rename to makefiles/Makefile-release_notes.in
index bab98e94ad..4435b6fb29 100644
--- a/release_notes/Makefile
+++ b/makefiles/Makefile-release_notes.in
@@ -1,4 +1,4 @@
-m = a6le
+m = $(m)
 Scheme=../$m/bin/$m/scheme -b ../$m/boot/$m/petite.boot -b ../$m/boot/$m/scheme.boot
 STEXLIB=../stex
 installdir=/tmp/csv9
diff --git a/makefiles/Makefile.in b/makefiles/Makefile.in
index 0b2bf497ea..24a6caff47 100644
--- a/makefiles/Makefile.in
+++ b/makefiles/Makefile.in
@@ -35,8 +35,10 @@ clean:
 	(cd $(workarea) && $(MAKE) clean)
 
 distclean:
-	(cd csug ; make reallyreallyclean)
-	(cd release_notes ; make reallyreallyclean)
+	(cd csug ; if [ -e Makefile ] ; then make reallyreallyclean ; fi)
+	rm -f csug/Makefile
+	(cd release_notes ; if [ -e Makefile ] ; then make reallyreallyclean ; fi)
+	rm -f release_notes/Makefile
 	rm -rf $(workarea)
 	rm -f Makefile
 	rm -f Make.out