Chez Scheme 9.5.8v9.5.8

81 files changed, 155 insertions, 137 deletions

diff --git a/BUILDING b/BUILDING
index e8de19b9..f0748068 100644
--- a/BUILDING
+++ b/BUILDING
@@ -1,5 +1,5 @@
-Building Chez Scheme Version 9.5.7
-Copyright 1984-2021 Cisco Systems, Inc.
+Building Chez Scheme Version 9.5.8
+Copyright 1984-2022 Cisco Systems, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/LOG b/LOG
index e2f6ab32..435cd9fc 100644
--- a/LOG
+++ b/LOG
@@ -2284,3 +2284,13 @@
     configure
 - update zlib to version 1.2.12 (which fixes CVE-2018-25032)
     configure c/Mf-*le
+
+9.5.8 changes:
+- updated version to 9.5.8
+    BUILDING NOTICE makefiles/Mf-install.in scheme.1.in c/Makefile.a6nt
+    c/Makefile.i3nt c/Makefile.ta6nt c/Makefile.ti3nt mats/Mf-a6nt
+    mats/Mf-i3nt mats/Mf-ta6nt mats/Mf-ti3nt workarea c/scheme.rc s/7.ss
+    s/cmacros.ss release_notes/release_notes.stex csug/copyright.stex
+    csug/csug.stex bintar/Makefile rpm/Makefile pkg/Makefile
+    wininstall/Makefile wininstall/a6nt.wxs wininstall/i3nt.wxs
+    wininstall/ta6nt.wxs wininstall/ti3nt.wxs newrelease
diff --git a/NOTICE b/NOTICE
index 7204f4a6..3f63ebd7 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
-Chez Scheme Version 9.5.7
-Copyright 1984-2021 Cisco Systems, Inc.
+Chez Scheme Version 9.5.8
+Copyright 1984-2022 Cisco Systems, Inc.
 
 This product includes code developed by Cisco Systems, Inc.
 
diff --git a/bintar/Makefile b/bintar/Makefile
index b2c7f700..0df6ca69 100644
--- a/bintar/Makefile
+++ b/bintar/Makefile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version = 9.5.7
+version = 9.5.8
 m := $(shell find ../bin/* -type d | xargs basename)
 
 R = csv$(version)
@@ -61,7 +61,7 @@ $(R)/boot: $(R)
 	( cd $(R)/boot/$(m) ; ln -s ../../../../boot/$(m)/{scheme.h,petite.boot,scheme.boot,revision} . )
 	case $(m) in \
           *nt) \
-            ( cd $R/boot/$(m) ; ln -s ../../../../boot/$(m)/{csv957md.lib,csv957mt.lib,mainmd.obj,mainmt.obj,scheme.res} . ) \
+            ( cd $R/boot/$(m) ; ln -s ../../../../boot/$(m)/{csv958md.lib,csv958mt.lib,mainmd.obj,mainmt.obj,scheme.res} . ) \
             ;; \
           *) \
             ( cd $R/boot/$(m) ; ln -s ../../../../boot/$(m)/{main.o,kernel.o} . ) \
@@ -72,7 +72,7 @@ $(R)/bin: $(R)
 	mkdir -p $(R)/bin/$(m)
 	case $(m) in \
           *nt) \
-            ( cd $R/bin/$(m) ; ln -s ../../../../bin/$(m)/{scheme.exe,csv957.dll,csv957.lib,vcruntime140.lib} . ) \
+            ( cd $R/bin/$(m) ; ln -s ../../../../bin/$(m)/{scheme.exe,csv958.dll,csv958.lib,vcruntime140.lib} . ) \
             ;; \
           *) \
             ( cd $R/bin/$(m) ; ln -s ../../../../bin/$(m)/scheme . ) \
diff --git a/boot/a6le/equates.h b/boot/a6le/equates.h
index bea308f8..8320221f 100644
--- a/boot/a6le/equates.h
+++ b/boot/a6le/equates.h
@@ -1,4 +1,4 @@
-/* equates.h for Chez Scheme Version 9.5.7 */
+/* equates.h for Chez Scheme Version 9.5.8 */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -485,7 +485,7 @@ typedef unsigned long U64;
 #define rtd_sealed 0x4
 #define sbwp (ptr)0x4E
 #define scaled_shot_1_shot_flag -0x8
-#define scheme_version 0x90507
+#define scheme_version 0x90508
 #define segment_card_offset_bits 0x5
 #define segment_offset_bits 0xE
 #define segment_t1_bits 0x10
diff --git a/boot/a6le/petite.boot b/boot/a6le/petite.boot
index 91a5378b..74f8b6a4 100644
--- a/boot/a6le/petite.boot
+++ b/boot/a6le/petite.boot
diff --git a/boot/a6le/scheme.boot b/boot/a6le/scheme.boot
index 8650e5c8..67253712 100644
--- a/boot/a6le/scheme.boot
+++ b/boot/a6le/scheme.boot
diff --git a/boot/a6le/scheme.h b/boot/a6le/scheme.h
index b363744a..f36fc005 100644
--- a/boot/a6le/scheme.h
+++ b/boot/a6le/scheme.h
@@ -1,4 +1,4 @@
-/* scheme.h for Chez Scheme Version 9.5.7 (a6le) */
+/* scheme.h for Chez Scheme Version 9.5.8 (a6le) */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -35,7 +35,7 @@
 #endif
 
 /* Chez Scheme Version and machine type */
-#define VERSION "9.5.7"
+#define VERSION "9.5.8"
 #define MACHINE_TYPE "a6le"
 
 /* All Scheme objects are of type ptr.  Type iptr and */
diff --git a/boot/a6nt/equates.h b/boot/a6nt/equates.h
index 3db4c951..e02b86e4 100644
--- a/boot/a6nt/equates.h
+++ b/boot/a6nt/equates.h
@@ -1,4 +1,4 @@
-/* equates.h for Chez Scheme Version 9.5.7 */
+/* equates.h for Chez Scheme Version 9.5.8 */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -485,7 +485,7 @@ typedef unsigned long long U64;
 #define rtd_sealed 0x4
 #define sbwp (ptr)0x4E
 #define scaled_shot_1_shot_flag -0x8
-#define scheme_version 0x90507
+#define scheme_version 0x90508
 #define segment_card_offset_bits 0x5
 #define segment_offset_bits 0xE
 #define segment_t1_bits 0x10
diff --git a/boot/a6nt/petite.boot b/boot/a6nt/petite.boot
index e3bfb334..70c95382 100644
--- a/boot/a6nt/petite.boot
+++ b/boot/a6nt/petite.boot
diff --git a/boot/a6nt/scheme.boot b/boot/a6nt/scheme.boot
index a13b6d2c..a40be060 100644
--- a/boot/a6nt/scheme.boot
+++ b/boot/a6nt/scheme.boot
diff --git a/boot/a6nt/scheme.h b/boot/a6nt/scheme.h
index 82a23054..c5ae0edb 100644
--- a/boot/a6nt/scheme.h
+++ b/boot/a6nt/scheme.h
@@ -1,4 +1,4 @@
-/* scheme.h for Chez Scheme Version 9.5.7 (a6nt) */
+/* scheme.h for Chez Scheme Version 9.5.8 (a6nt) */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -35,7 +35,7 @@
 #endif
 
 /* Chez Scheme Version and machine type */
-#define VERSION "9.5.7"
+#define VERSION "9.5.8"
 #define MACHINE_TYPE "a6nt"
 
 /* All Scheme objects are of type ptr.  Type iptr and */
diff --git a/boot/a6osx/equates.h b/boot/a6osx/equates.h
index 30b8c49c..cde4906a 100644
--- a/boot/a6osx/equates.h
+++ b/boot/a6osx/equates.h
@@ -1,4 +1,4 @@
-/* equates.h for Chez Scheme Version 9.5.7 */
+/* equates.h for Chez Scheme Version 9.5.8 */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -485,7 +485,7 @@ typedef unsigned long U64;
 #define rtd_sealed 0x4
 #define sbwp (ptr)0x4E
 #define scaled_shot_1_shot_flag -0x8
-#define scheme_version 0x90507
+#define scheme_version 0x90508
 #define segment_card_offset_bits 0x5
 #define segment_offset_bits 0xE
 #define segment_t1_bits 0x10
diff --git a/boot/a6osx/petite.boot b/boot/a6osx/petite.boot
index bbe7b49e..9c4827f6 100644
--- a/boot/a6osx/petite.boot
+++ b/boot/a6osx/petite.boot
diff --git a/boot/a6osx/scheme.boot b/boot/a6osx/scheme.boot
index b98da80e..ae61d281 100644
--- a/boot/a6osx/scheme.boot
+++ b/boot/a6osx/scheme.boot
diff --git a/boot/a6osx/scheme.h b/boot/a6osx/scheme.h
index bc878ec4..5f4e79ee 100644
--- a/boot/a6osx/scheme.h
+++ b/boot/a6osx/scheme.h
@@ -1,4 +1,4 @@
-/* scheme.h for Chez Scheme Version 9.5.7 (a6osx) */
+/* scheme.h for Chez Scheme Version 9.5.8 (a6osx) */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -35,7 +35,7 @@
 #endif
 
 /* Chez Scheme Version and machine type */
-#define VERSION "9.5.7"
+#define VERSION "9.5.8"
 #define MACHINE_TYPE "a6osx"
 
 /* All Scheme objects are of type ptr.  Type iptr and */
diff --git a/boot/arm32le/equates.h b/boot/arm32le/equates.h
index 91b6ee8d..6bb03779 100644
--- a/boot/arm32le/equates.h
+++ b/boot/arm32le/equates.h
@@ -1,4 +1,4 @@
-/* equates.h for Chez Scheme Version 9.5.7 */
+/* equates.h for Chez Scheme Version 9.5.8 */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -486,7 +486,7 @@ typedef unsigned long long U64;
 #define rtd_sealed 0x4
 #define sbwp (ptr)0x4E
 #define scaled_shot_1_shot_flag -0x4
-#define scheme_version 0x90507
+#define scheme_version 0x90508
 #define segment_card_offset_bits 0x5
 #define segment_offset_bits 0xD
 #define segment_t1_bits 0x13
diff --git a/boot/arm32le/petite.boot b/boot/arm32le/petite.boot
index 55763147..0680741f 100644
--- a/boot/arm32le/petite.boot
+++ b/boot/arm32le/petite.boot
diff --git a/boot/arm32le/scheme.boot b/boot/arm32le/scheme.boot
index 0c78fdd3..132825d4 100644
--- a/boot/arm32le/scheme.boot
+++ b/boot/arm32le/scheme.boot
diff --git a/boot/arm32le/scheme.h b/boot/arm32le/scheme.h
index ccdedeba..07805a6e 100644
--- a/boot/arm32le/scheme.h
+++ b/boot/arm32le/scheme.h
@@ -1,4 +1,4 @@
-/* scheme.h for Chez Scheme Version 9.5.7 (arm32le) */
+/* scheme.h for Chez Scheme Version 9.5.8 (arm32le) */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -35,7 +35,7 @@
 #endif
 
 /* Chez Scheme Version and machine type */
-#define VERSION "9.5.7"
+#define VERSION "9.5.8"
 #define MACHINE_TYPE "arm32le"
 
 /* All Scheme objects are of type ptr.  Type iptr and */
diff --git a/boot/i3le/equates.h b/boot/i3le/equates.h
index 24599a20..b91c86e3 100644
--- a/boot/i3le/equates.h
+++ b/boot/i3le/equates.h
@@ -1,4 +1,4 @@
-/* equates.h for Chez Scheme Version 9.5.7 */
+/* equates.h for Chez Scheme Version 9.5.8 */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -485,7 +485,7 @@ typedef unsigned long long U64;
 #define rtd_sealed 0x4
 #define sbwp (ptr)0x4E
 #define scaled_shot_1_shot_flag -0x4
-#define scheme_version 0x90507
+#define scheme_version 0x90508
 #define segment_card_offset_bits 0x5
 #define segment_offset_bits 0xD
 #define segment_t1_bits 0x13
diff --git a/boot/i3le/petite.boot b/boot/i3le/petite.boot
index 5639ed17..95f21f2d 100644
--- a/boot/i3le/petite.boot
+++ b/boot/i3le/petite.boot
diff --git a/boot/i3le/scheme.boot b/boot/i3le/scheme.boot
index 8a7ae0bc..cf65ee1d 100644
--- a/boot/i3le/scheme.boot
+++ b/boot/i3le/scheme.boot
diff --git a/boot/i3le/scheme.h b/boot/i3le/scheme.h
index 5aab051c..00029f1f 100644
--- a/boot/i3le/scheme.h
+++ b/boot/i3le/scheme.h
@@ -1,4 +1,4 @@
-/* scheme.h for Chez Scheme Version 9.5.7 (i3le) */
+/* scheme.h for Chez Scheme Version 9.5.8 (i3le) */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -35,7 +35,7 @@
 #endif
 
 /* Chez Scheme Version and machine type */
-#define VERSION "9.5.7"
+#define VERSION "9.5.8"
 #define MACHINE_TYPE "i3le"
 
 /* All Scheme objects are of type ptr.  Type iptr and */
diff --git a/boot/i3nt/equates.h b/boot/i3nt/equates.h
index 5b5c545f..80d8032f 100644
--- a/boot/i3nt/equates.h
+++ b/boot/i3nt/equates.h
@@ -1,4 +1,4 @@
-/* equates.h for Chez Scheme Version 9.5.7 */
+/* equates.h for Chez Scheme Version 9.5.8 */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -485,7 +485,7 @@ typedef unsigned long long U64;
 #define rtd_sealed 0x4
 #define sbwp (ptr)0x4E
 #define scaled_shot_1_shot_flag -0x4
-#define scheme_version 0x90507
+#define scheme_version 0x90508
 #define segment_card_offset_bits 0x5
 #define segment_offset_bits 0xD
 #define segment_t1_bits 0x13
diff --git a/boot/i3nt/petite.boot b/boot/i3nt/petite.boot
index f8de0dca..4820b503 100644
--- a/boot/i3nt/petite.boot
+++ b/boot/i3nt/petite.boot
diff --git a/boot/i3nt/scheme.boot b/boot/i3nt/scheme.boot
index 8012bbc5..87528979 100644
--- a/boot/i3nt/scheme.boot
+++ b/boot/i3nt/scheme.boot
diff --git a/boot/i3nt/scheme.h b/boot/i3nt/scheme.h
index a0694f93..437ceca8 100644
--- a/boot/i3nt/scheme.h
+++ b/boot/i3nt/scheme.h
@@ -1,4 +1,4 @@
-/* scheme.h for Chez Scheme Version 9.5.7 (i3nt) */
+/* scheme.h for Chez Scheme Version 9.5.8 (i3nt) */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -35,7 +35,7 @@
 #endif
 
 /* Chez Scheme Version and machine type */
-#define VERSION "9.5.7"
+#define VERSION "9.5.8"
 #define MACHINE_TYPE "i3nt"
 
 /* All Scheme objects are of type ptr.  Type iptr and */
diff --git a/boot/i3osx/equates.h b/boot/i3osx/equates.h
index 58619434..4f663313 100644
--- a/boot/i3osx/equates.h
+++ b/boot/i3osx/equates.h
@@ -1,4 +1,4 @@
-/* equates.h for Chez Scheme Version 9.5.7 */
+/* equates.h for Chez Scheme Version 9.5.8 */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -485,7 +485,7 @@ typedef unsigned long long U64;
 #define rtd_sealed 0x4
 #define sbwp (ptr)0x4E
 #define scaled_shot_1_shot_flag -0x4
-#define scheme_version 0x90507
+#define scheme_version 0x90508
 #define segment_card_offset_bits 0x5
 #define segment_offset_bits 0xD
 #define segment_t1_bits 0x13
diff --git a/boot/i3osx/petite.boot b/boot/i3osx/petite.boot
index 6747a62b..0757978e 100644
--- a/boot/i3osx/petite.boot
+++ b/boot/i3osx/petite.boot
diff --git a/boot/i3osx/scheme.boot b/boot/i3osx/scheme.boot
index 5c468e4a..8e9bc5e1 100644
--- a/boot/i3osx/scheme.boot
+++ b/boot/i3osx/scheme.boot
diff --git a/boot/i3osx/scheme.h b/boot/i3osx/scheme.h
index fab79da3..168847c8 100644
--- a/boot/i3osx/scheme.h
+++ b/boot/i3osx/scheme.h
@@ -1,4 +1,4 @@
-/* scheme.h for Chez Scheme Version 9.5.7 (i3osx) */
+/* scheme.h for Chez Scheme Version 9.5.8 (i3osx) */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -35,7 +35,7 @@
 #endif
 
 /* Chez Scheme Version and machine type */
-#define VERSION "9.5.7"
+#define VERSION "9.5.8"
 #define MACHINE_TYPE "i3osx"
 
 /* All Scheme objects are of type ptr.  Type iptr and */
diff --git a/boot/ta6le/equates.h b/boot/ta6le/equates.h
index 475f6f49..884fd964 100644
--- a/boot/ta6le/equates.h
+++ b/boot/ta6le/equates.h
@@ -1,4 +1,4 @@
-/* equates.h for Chez Scheme Version 9.5.7 */
+/* equates.h for Chez Scheme Version 9.5.8 */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -485,7 +485,7 @@ typedef unsigned long U64;
 #define rtd_sealed 0x4
 #define sbwp (ptr)0x4E
 #define scaled_shot_1_shot_flag -0x8
-#define scheme_version 0x90507
+#define scheme_version 0x90508
 #define segment_card_offset_bits 0x5
 #define segment_offset_bits 0xE
 #define segment_t1_bits 0x10
diff --git a/boot/ta6le/petite.boot b/boot/ta6le/petite.boot
index 40c1505d..072600a9 100644
--- a/boot/ta6le/petite.boot
+++ b/boot/ta6le/petite.boot
diff --git a/boot/ta6le/scheme.boot b/boot/ta6le/scheme.boot
index 9c37065e..41273717 100644
--- a/boot/ta6le/scheme.boot
+++ b/boot/ta6le/scheme.boot
diff --git a/boot/ta6le/scheme.h b/boot/ta6le/scheme.h
index a0a0cf7f..11c2d4aa 100644
--- a/boot/ta6le/scheme.h
+++ b/boot/ta6le/scheme.h
@@ -1,4 +1,4 @@
-/* scheme.h for Chez Scheme Version 9.5.7 (ta6le) */
+/* scheme.h for Chez Scheme Version 9.5.8 (ta6le) */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -35,7 +35,7 @@
 #endif
 
 /* Chez Scheme Version and machine type */
-#define VERSION "9.5.7"
+#define VERSION "9.5.8"
 #define MACHINE_TYPE "ta6le"
 
 /* All Scheme objects are of type ptr.  Type iptr and */
diff --git a/boot/ta6nt/equates.h b/boot/ta6nt/equates.h
index bd6a7463..c2087572 100644
--- a/boot/ta6nt/equates.h
+++ b/boot/ta6nt/equates.h
@@ -1,4 +1,4 @@
-/* equates.h for Chez Scheme Version 9.5.7 */
+/* equates.h for Chez Scheme Version 9.5.8 */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -485,7 +485,7 @@ typedef unsigned long long U64;
 #define rtd_sealed 0x4
 #define sbwp (ptr)0x4E
 #define scaled_shot_1_shot_flag -0x8
-#define scheme_version 0x90507
+#define scheme_version 0x90508
 #define segment_card_offset_bits 0x5
 #define segment_offset_bits 0xE
 #define segment_t1_bits 0x10
diff --git a/boot/ta6nt/petite.boot b/boot/ta6nt/petite.boot
index 8afde423..ea6da62e 100644
--- a/boot/ta6nt/petite.boot
+++ b/boot/ta6nt/petite.boot
diff --git a/boot/ta6nt/scheme.boot b/boot/ta6nt/scheme.boot
index 7a9d9212..559c5b9d 100644
--- a/boot/ta6nt/scheme.boot
+++ b/boot/ta6nt/scheme.boot
diff --git a/boot/ta6nt/scheme.h b/boot/ta6nt/scheme.h
index dd3fbc5b..3ee69570 100644
--- a/boot/ta6nt/scheme.h
+++ b/boot/ta6nt/scheme.h
@@ -1,4 +1,4 @@
-/* scheme.h for Chez Scheme Version 9.5.7 (ta6nt) */
+/* scheme.h for Chez Scheme Version 9.5.8 (ta6nt) */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -35,7 +35,7 @@
 #endif
 
 /* Chez Scheme Version and machine type */
-#define VERSION "9.5.7"
+#define VERSION "9.5.8"
 #define MACHINE_TYPE "ta6nt"
 
 /* All Scheme objects are of type ptr.  Type iptr and */
diff --git a/boot/ta6osx/equates.h b/boot/ta6osx/equates.h
index 9cb4a642..87d4db47 100644
--- a/boot/ta6osx/equates.h
+++ b/boot/ta6osx/equates.h
@@ -1,4 +1,4 @@
-/* equates.h for Chez Scheme Version 9.5.7 */
+/* equates.h for Chez Scheme Version 9.5.8 */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -485,7 +485,7 @@ typedef unsigned long U64;
 #define rtd_sealed 0x4
 #define sbwp (ptr)0x4E
 #define scaled_shot_1_shot_flag -0x8
-#define scheme_version 0x90507
+#define scheme_version 0x90508
 #define segment_card_offset_bits 0x5
 #define segment_offset_bits 0xE
 #define segment_t1_bits 0x10
diff --git a/boot/ta6osx/petite.boot b/boot/ta6osx/petite.boot
index df47ee7f..19d92403 100644
--- a/boot/ta6osx/petite.boot
+++ b/boot/ta6osx/petite.boot
diff --git a/boot/ta6osx/scheme.boot b/boot/ta6osx/scheme.boot
index f0a1f484..1b4cab25 100644
--- a/boot/ta6osx/scheme.boot
+++ b/boot/ta6osx/scheme.boot
diff --git a/boot/ta6osx/scheme.h b/boot/ta6osx/scheme.h
index e49a9aa8..34a24d4e 100644
--- a/boot/ta6osx/scheme.h
+++ b/boot/ta6osx/scheme.h
@@ -1,4 +1,4 @@
-/* scheme.h for Chez Scheme Version 9.5.7 (ta6osx) */
+/* scheme.h for Chez Scheme Version 9.5.8 (ta6osx) */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -35,7 +35,7 @@
 #endif
 
 /* Chez Scheme Version and machine type */
-#define VERSION "9.5.7"
+#define VERSION "9.5.8"
 #define MACHINE_TYPE "ta6osx"
 
 /* All Scheme objects are of type ptr.  Type iptr and */
diff --git a/boot/ti3le/equates.h b/boot/ti3le/equates.h
index 3a716963..ae0251af 100644
--- a/boot/ti3le/equates.h
+++ b/boot/ti3le/equates.h
@@ -1,4 +1,4 @@
-/* equates.h for Chez Scheme Version 9.5.7 */
+/* equates.h for Chez Scheme Version 9.5.8 */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -485,7 +485,7 @@ typedef unsigned long long U64;
 #define rtd_sealed 0x4
 #define sbwp (ptr)0x4E
 #define scaled_shot_1_shot_flag -0x4
-#define scheme_version 0x90507
+#define scheme_version 0x90508
 #define segment_card_offset_bits 0x5
 #define segment_offset_bits 0xD
 #define segment_t1_bits 0x13
diff --git a/boot/ti3le/petite.boot b/boot/ti3le/petite.boot
index 960a65fc..2ba676c2 100644
--- a/boot/ti3le/petite.boot
+++ b/boot/ti3le/petite.boot
diff --git a/boot/ti3le/scheme.boot b/boot/ti3le/scheme.boot
index 4b62e353..72a0042e 100644
--- a/boot/ti3le/scheme.boot
+++ b/boot/ti3le/scheme.boot
diff --git a/boot/ti3le/scheme.h b/boot/ti3le/scheme.h
index 1cfa2dd7..14a7d24a 100644
--- a/boot/ti3le/scheme.h
+++ b/boot/ti3le/scheme.h
@@ -1,4 +1,4 @@
-/* scheme.h for Chez Scheme Version 9.5.7 (ti3le) */
+/* scheme.h for Chez Scheme Version 9.5.8 (ti3le) */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -35,7 +35,7 @@
 #endif
 
 /* Chez Scheme Version and machine type */
-#define VERSION "9.5.7"
+#define VERSION "9.5.8"
 #define MACHINE_TYPE "ti3le"
 
 /* All Scheme objects are of type ptr.  Type iptr and */
diff --git a/boot/ti3nt/equates.h b/boot/ti3nt/equates.h
index 6cec0e30..4102a30f 100644
--- a/boot/ti3nt/equates.h
+++ b/boot/ti3nt/equates.h
@@ -1,4 +1,4 @@
-/* equates.h for Chez Scheme Version 9.5.7 */
+/* equates.h for Chez Scheme Version 9.5.8 */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -485,7 +485,7 @@ typedef unsigned long long U64;
 #define rtd_sealed 0x4
 #define sbwp (ptr)0x4E
 #define scaled_shot_1_shot_flag -0x4
-#define scheme_version 0x90507
+#define scheme_version 0x90508
 #define segment_card_offset_bits 0x5
 #define segment_offset_bits 0xD
 #define segment_t1_bits 0x13
diff --git a/boot/ti3nt/petite.boot b/boot/ti3nt/petite.boot
index 08364d87..d07bc878 100644
--- a/boot/ti3nt/petite.boot
+++ b/boot/ti3nt/petite.boot
diff --git a/boot/ti3nt/scheme.boot b/boot/ti3nt/scheme.boot
index 22890310..67da6b7e 100644
--- a/boot/ti3nt/scheme.boot
+++ b/boot/ti3nt/scheme.boot
diff --git a/boot/ti3nt/scheme.h b/boot/ti3nt/scheme.h
index 1413df46..af792621 100644
--- a/boot/ti3nt/scheme.h
+++ b/boot/ti3nt/scheme.h
@@ -1,4 +1,4 @@
-/* scheme.h for Chez Scheme Version 9.5.7 (ti3nt) */
+/* scheme.h for Chez Scheme Version 9.5.8 (ti3nt) */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -35,7 +35,7 @@
 #endif
 
 /* Chez Scheme Version and machine type */
-#define VERSION "9.5.7"
+#define VERSION "9.5.8"
 #define MACHINE_TYPE "ti3nt"
 
 /* All Scheme objects are of type ptr.  Type iptr and */
diff --git a/boot/ti3osx/equates.h b/boot/ti3osx/equates.h
index 10b77f48..622024af 100644
--- a/boot/ti3osx/equates.h
+++ b/boot/ti3osx/equates.h
@@ -1,4 +1,4 @@
-/* equates.h for Chez Scheme Version 9.5.7 */
+/* equates.h for Chez Scheme Version 9.5.8 */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -485,7 +485,7 @@ typedef unsigned long long U64;
 #define rtd_sealed 0x4
 #define sbwp (ptr)0x4E
 #define scaled_shot_1_shot_flag -0x4
-#define scheme_version 0x90507
+#define scheme_version 0x90508
 #define segment_card_offset_bits 0x5
 #define segment_offset_bits 0xD
 #define segment_t1_bits 0x13
diff --git a/boot/ti3osx/petite.boot b/boot/ti3osx/petite.boot
index 717ebf58..f9cfe9c6 100644
--- a/boot/ti3osx/petite.boot
+++ b/boot/ti3osx/petite.boot
diff --git a/boot/ti3osx/scheme.boot b/boot/ti3osx/scheme.boot
index 0b46ce82..91166c2e 100644
--- a/boot/ti3osx/scheme.boot
+++ b/boot/ti3osx/scheme.boot
diff --git a/boot/ti3osx/scheme.h b/boot/ti3osx/scheme.h
index 094a9dad..ae6623f4 100644
--- a/boot/ti3osx/scheme.h
+++ b/boot/ti3osx/scheme.h
@@ -1,4 +1,4 @@
-/* scheme.h for Chez Scheme Version 9.5.7 (ti3osx) */
+/* scheme.h for Chez Scheme Version 9.5.8 (ti3osx) */
 
 /* Do not edit this file.  It is automatically generated and */
 /* specifically tailored to the version of Chez Scheme named */
@@ -35,7 +35,7 @@
 #endif
 
 /* Chez Scheme Version and machine type */
-#define VERSION "9.5.7"
+#define VERSION "9.5.8"
 #define MACHINE_TYPE "ti3osx"
 
 /* All Scheme objects are of type ptr.  Type iptr and */
diff --git a/c/Makefile.a6nt b/c/Makefile.a6nt
index 869741a2..43d46483 100644
--- a/c/Makefile.a6nt
+++ b/c/Makefile.a6nt
@@ -17,11 +17,11 @@ m = a6nt
 
 # following have to use \ for directory separator
 SchemeInclude = ..\boot\$m
-KernelDll = ..\bin\$m\csv957.dll
-KernelLib = ..\bin\$m\csv957.lib
-MTKernelLib = ..\boot\$m\csv957mt.lib
-MDKernelLib = ..\boot\$m\csv957md.lib
-KernelExp = ..\bin\$m\csv957.exp
+KernelDll = ..\bin\$m\csv958.dll
+KernelLib = ..\bin\$m\csv958.lib
+MTKernelLib = ..\boot\$m\csv958mt.lib
+MDKernelLib = ..\boot\$m\csv958md.lib
+KernelExp = ..\bin\$m\csv958.exp
 Exec = ..\bin\$m\scheme.exe
 MTMain = ..\boot\$m\mainmt.obj
 MDMain = ..\boot\$m\mainmd.obj
diff --git a/c/Makefile.i3nt b/c/Makefile.i3nt
index eda0741d..c7f35612 100644
--- a/c/Makefile.i3nt
+++ b/c/Makefile.i3nt
@@ -17,11 +17,11 @@ m = i3nt
 
 # following have to use \ for directory separator
 SchemeInclude = ..\boot\$m
-KernelDll = ..\bin\$m\csv957.dll
-KernelLib = ..\bin\$m\csv957.lib
-MTKernelLib = ..\boot\$m\csv957mt.lib
-MDKernelLib = ..\boot\$m\csv957md.lib
-KernelExp = ..\bin\$m\csv957.exp
+KernelDll = ..\bin\$m\csv958.dll
+KernelLib = ..\bin\$m\csv958.lib
+MTKernelLib = ..\boot\$m\csv958mt.lib
+MDKernelLib = ..\boot\$m\csv958md.lib
+KernelExp = ..\bin\$m\csv958.exp
 Exec = ..\bin\$m\scheme.exe
 MTMain = ..\boot\$m\mainmt.obj
 MDMain = ..\boot\$m\mainmd.obj
diff --git a/c/Makefile.ta6nt b/c/Makefile.ta6nt
index c7a1f54b..30fad7fa 100644
--- a/c/Makefile.ta6nt
+++ b/c/Makefile.ta6nt
@@ -17,11 +17,11 @@ m = ta6nt
 
 # following have to use \ for directory separator
 SchemeInclude = ..\boot\$m
-KernelDll = ..\bin\$m\csv957.dll
-KernelLib = ..\bin\$m\csv957.lib
-MTKernelLib = ..\boot\$m\csv957mt.lib
-MDKernelLib = ..\boot\$m\csv957md.lib
-KernelExp = ..\bin\$m\csv957.exp
+KernelDll = ..\bin\$m\csv958.dll
+KernelLib = ..\bin\$m\csv958.lib
+MTKernelLib = ..\boot\$m\csv958mt.lib
+MDKernelLib = ..\boot\$m\csv958md.lib
+KernelExp = ..\bin\$m\csv958.exp
 Exec = ..\bin\$m\scheme.exe
 MTMain = ..\boot\$m\mainmt.obj
 MDMain = ..\boot\$m\mainmd.obj
diff --git a/c/Makefile.ti3nt b/c/Makefile.ti3nt
index 2be6fcaf..6681ea13 100644
--- a/c/Makefile.ti3nt
+++ b/c/Makefile.ti3nt
@@ -17,11 +17,11 @@ m = ti3nt
 
 # following have to use \ for directory separator
 SchemeInclude = ..\boot\$m
-KernelDll = ..\bin\$m\csv957.dll
-KernelLib = ..\bin\$m\csv957.lib
-MTKernelLib = ..\boot\$m\csv957mt.lib
-MDKernelLib = ..\boot\$m\csv957md.lib
-KernelExp = ..\bin\$m\csv957.exp
+KernelDll = ..\bin\$m\csv958.dll
+KernelLib = ..\bin\$m\csv958.lib
+MTKernelLib = ..\boot\$m\csv958mt.lib
+MDKernelLib = ..\boot\$m\csv958md.lib
+KernelExp = ..\bin\$m\csv958.exp
 Exec = ..\bin\$m\scheme.exe
 MTMain = ..\boot\$m\mainmt.obj
 MDMain = ..\boot\$m\mainmd.obj
diff --git a/c/scheme.rc b/c/scheme.rc
index 128a1ae8..e13a55fc 100644
--- a/c/scheme.rc
+++ b/c/scheme.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 9,5,7,0
- PRODUCTVERSION 9,5,7,0
+ FILEVERSION 9,5,8,0
+ PRODUCTVERSION 9,5,8,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS VOS__WINDOWS32
@@ -12,13 +12,13 @@ VS_VERSION_INFO VERSIONINFO
  BLOCK "StringFileInfo" {
   BLOCK "04090000" {
    VALUE "CompanyName", "Cisco Systems, Inc."
-   VALUE "FileDescription", "Chez Scheme Version 9.5.7"
-   VALUE "FileVersion", "9.5.7"
+   VALUE "FileDescription", "Chez Scheme Version 9.5.8"
+   VALUE "FileVersion", "9.5.8"
    VALUE "InternalName", "scheme.exe"
-   VALUE "LegalCopyright", "Copyright 1984-2021 Cisco Systems, Inc.  Licensed under the Apache License, Version 2.0."
+   VALUE "LegalCopyright", "Copyright 1984-2022 Cisco Systems, Inc.  Licensed under the Apache License, Version 2.0."
    VALUE "OriginalFilename", "scheme.exe"
    VALUE "ProductName", "Chez Scheme"
-   VALUE "ProductVersion", "9.5.7"
+   VALUE "ProductVersion", "9.5.8"
   }
  }
  BLOCK "VarFileInfo" {
diff --git a/csug/copyright.stex b/csug/copyright.stex
index aaf850cb..ca69c939 100644
--- a/csug/copyright.stex
+++ b/csug/copyright.stex
@@ -16,13 +16,13 @@
 
 \centerline{}\vfill
 
-\textbf{\copyright~2021 Cisco Systems, Inc.}
+\textbf{\copyright~2022 Cisco Systems, Inc.}
 
 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 \revisiondate~for Chez Scheme Version 9.5.7.
+Revised \revisiondate~for Chez Scheme Version 9.5.8.
 
 \medskip\noindent
 Cisco and the Cisco logo are trademarks or registered trademarks
diff --git a/csug/csug.stex b/csug/csug.stex
index 78709d82..fff3ac1d 100644
--- a/csug/csug.stex
+++ b/csug/csug.stex
@@ -22,7 +22,12 @@
 (case-sensitive #t)
 \endschemeinit
 
-\def\revisiondate{November 2021}
+\def\revisiondate{April 2022}
+
+% Just don't care amout small overflows, most of the time:
+\iflatex
+\hfuzz=16.0pt
+\fi
 
 \iflatex
 \usepackage{graphicx}
@@ -43,10 +48,10 @@
 \def\copyrightnotice{\raw{<hr class=copyright align=left>
 <p>
 <a class=plain href="index.html">Chez Scheme Version 9 User's Guide</a><br>
-Copyright &copy; 2021 Cisco Systems, Inc.<br>
+Copyright &copy; 2022 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} \revisiondate\raw{ for Chez Scheme Version 9.5.7<br>
+Revised} \revisiondate\raw{ for Chez Scheme Version 9.5.8<br>
 <a class=plain href="canned/about.html">about this book</a>
 </tr></table>
 }}
diff --git a/makefiles/Mf-install.in b/makefiles/Mf-install.in
index b47d11a2..7ff861a2 100644
--- a/makefiles/Mf-install.in
+++ b/makefiles/Mf-install.in
@@ -62,7 +62,7 @@ InstallLZ4Target=
 #                 no changes should be needed below this point                #
 ###############################################################################
 
-Version=csv9.5.7
+Version=csv9.5.8
 Include=boot/$m
 PetiteBoot=boot/$m/petite.boot
 SchemeBoot=boot/$m/scheme.boot
diff --git a/mats/Mf-a6nt b/mats/Mf-a6nt
index 493f8810..c38537c6 100644
--- a/mats/Mf-a6nt
+++ b/mats/Mf-a6nt
@@ -25,7 +25,7 @@ export MSYS_NO_PATHCONV=1
 export MSYS2_ARG_CONV_EXCL=*
 
 foreign1.so: $(fsrc)
-	cmd.exe /c "vs.bat amd64 && cl /DWIN32 /DX86_64 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv957.lib $(fsrc)"
+	cmd.exe /c "vs.bat amd64 && cl /DWIN32 /DX86_64 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv958.lib $(fsrc)"
 
 cat_flush.exe: cat_flush.c
 	cmd.exe /c "vs.bat amd64 && cl /DWIN32 /DX86_64 /MD /nologo $<"
diff --git a/mats/Mf-i3nt b/mats/Mf-i3nt
index bb31f675..583021f2 100644
--- a/mats/Mf-i3nt
+++ b/mats/Mf-i3nt
@@ -25,7 +25,7 @@ export MSYS_NO_PATHCONV=1
 export MSYS2_ARG_CONV_EXCL=*
 
 foreign1.so: $(fsrc)
-	cmd.exe /c "vs.bat x86 && cl /DWIN32 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv957.lib $(fsrc)"
+	cmd.exe /c "vs.bat x86 && cl /DWIN32 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv958.lib $(fsrc)"
 
 cat_flush.exe: cat_flush.c
 	cmd.exe /c "vs.bat x86 && cl /DWIN32 /MD /nologo $<"
diff --git a/mats/Mf-ta6nt b/mats/Mf-ta6nt
index 412091ea..ebdd4991 100644
--- a/mats/Mf-ta6nt
+++ b/mats/Mf-ta6nt
@@ -25,7 +25,7 @@ export MSYS_NO_PATHCONV=1
 export MSYS2_ARG_CONV_EXCL=*
 
 foreign1.so: $(fsrc)
-	cmd.exe /c "vs.bat amd64 && cl /DWIN32 /DX86_64 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv957.lib $(fsrc)"
+	cmd.exe /c "vs.bat amd64 && cl /DWIN32 /DX86_64 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv958.lib $(fsrc)"
 
 cat_flush.exe: cat_flush.c
 	cmd.exe /c "vs.bat amd64 && cl /DWIN32 /DX86_64 /MD /nologo $<"
diff --git a/mats/Mf-ti3nt b/mats/Mf-ti3nt
index 9c6d1a5b..d98abf7e 100644
--- a/mats/Mf-ti3nt
+++ b/mats/Mf-ti3nt
@@ -25,7 +25,7 @@ export MSYS_NO_PATHCONV=1
 export MSYS2_ARG_CONV_EXCL=*
 
 foreign1.so: $(fsrc)
-	cmd.exe /c "vs.bat x86 && cl /DWIN32 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv957.lib $(fsrc)"
+	cmd.exe /c "vs.bat x86 && cl /DWIN32 /Fe$@ /I${Include} /LD /MD /nologo ../bin/$m/csv958.lib $(fsrc)"
 
 cat_flush.exe: cat_flush.c
 	cmd.exe /c "vs.bat x86 && cl /DWIN32 /MD /nologo $<"
diff --git a/newrelease b/newrelease
index e0d90463..9cd7da1e 100755
--- a/newrelease
+++ b/newrelease
@@ -133,7 +133,10 @@ sed -e "s/scheme-version #x......../scheme-version #x$VNUM/" ../s/cmacros.ss > s
 set maybeupdatedfiles = ($maybeupdatedfiles s/cmacros.ss)
 
 mkdir release_notes
-sed -e "s/thisversion{Version [^ ]*}/thisversion{Version $R}/" ../release_notes/release_notes.stex > release_notes/release_notes.stex
+sed -e "s/thisversion{Version [^ ]*}/thisversion{Version $R}/" \
+    -e "s/pubmonth{.*}/pubmonth{`date +%B`}/" \
+    -e "s/pubyear{.*}/pubyear{`date +%Y`}/" \
+  ../release_notes/release_notes.stex > release_notes/release_notes.stex
 set maybeupdatedfiles = ($maybeupdatedfiles release_notes/release_notes.stex)
 
 mkdir csug
diff --git a/pkg/Makefile b/pkg/Makefile
index fa94fdf1..3dbfdfd1 100644
--- a/pkg/Makefile
+++ b/pkg/Makefile
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 m := $(shell find ../bin/* -type d | xargs basename)
-version = 9.5.7
+version = 9.5.8
 release = 1
 
 DOTUSER = $(shell ls -ld . | sed -e 's/[^ ]* *[^ ]* *\([^ ]*\).*/\1/')
@@ -77,7 +77,7 @@ $(BUILDROOT)/Distribution: $(BUILDROOT)
 $(BUILDROOT)/Resources/en.lproj/Welcome.html: $(BUILDROOT)/Resources/en.lproj
 	echo '<html>' > $(BUILDROOT)/Resources/en.lproj/Welcome.html
 	echo '<h3>Chez Scheme Version $(version)</h3>' >> $(BUILDROOT)/Resources/en.lproj/Welcome.html
-	echo '<p>Copyright &copy; 2021 Cisco Systems, Inc.</p>' >> $(BUILDROOT)/Resources/en.lproj/Welcome.html
+	echo '<p>Copyright &copy; 2022 Cisco Systems, Inc.</p>' >> $(BUILDROOT)/Resources/en.lproj/Welcome.html
 	echo '<p>Chez Scheme is a programming language and an implementation of that language, with supporting tools and documentation.</p>' >> $(BUILDROOT)/Resources/en.lproj/Welcome.html
 	echo '</html>' >> $(BUILDROOT)/Resources/en.lproj/Welcome.html
 	chmod 644 $(BUILDROOT)/Resources/en.lproj/Welcome.html
diff --git a/release_notes/release_notes.stex b/release_notes/release_notes.stex
index 3f1c3115..e6092ac9 100644
--- a/release_notes/release_notes.stex
+++ b/release_notes/release_notes.stex
@@ -1,9 +1,9 @@
 \documentclass{releasenotes}
 
-\thisversion{Version 9.5.7}
+\thisversion{Version 9.5.8}
 \thatversion{Version 8.4}
-\pubmonth{November}
-\pubyear{2021}
+\pubmonth{April}
+\pubyear{2022}
 
 \begin{document}
 
@@ -58,12 +58,12 @@ Online versions of both books can be found at
 %-----------------------------------------------------------------------------
 \section{Functionality Changes}\label{section:functionality}
 
-\subsection{Basic ftypes can be referenced, even if shadowed by syntactic binding (9.5.7)}
+\subsection{Basic ftypes can be referenced, even if shadowed by syntactic binding (9.5.8)}
 
 Previously, it was possible to interfere with the definition of ftypes by
 creating a syntactic binding for one of the built-in types, such as
 \scheme{integer-32}, \scheme{float}, etc.
-As of 9.5.7, syntactic bindings that do not bind an ftype descriptor are no
+As of 9.5.8, syntactic bindings that do not bind an ftype descriptor are no
 longer considered when defining ftypes.
 
 This change also allows a base ftype to be bound using `define-ftype`, though
diff --git a/rpm/Makefile b/rpm/Makefile
index d74bc492..1a0eb387 100644
--- a/rpm/Makefile
+++ b/rpm/Makefile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version = 9.5.7
+version = 9.5.8
 release = 1
 m := $(shell find ../bin/* -type d | xargs basename)
 arch := $(shell if test "$(m)" == "i3le" ; then echo i686 ; elif test "$(m)" == "a6le" ; then echo x86_64 ; else echo UNKNOWN ; fi)
diff --git a/s/7.ss b/s/7.ss
index 3bacd94e..d8c0868d 100644
--- a/s/7.ss
+++ b/s/7.ss
@@ -705,7 +705,7 @@
 
 (define $scheme-greeting
   (lambda ()
-    (format "~a\nCopyright 1984-2021 Cisco Systems, Inc.\n"
+    (format "~a\nCopyright 1984-2022 Cisco Systems, Inc.\n"
       (scheme-version))))
 
 (define $session-key #f)
diff --git a/s/cmacros.ss b/s/cmacros.ss
index 25ff0d53..e3eb49a3 100644
--- a/s/cmacros.ss
+++ b/s/cmacros.ss
@@ -328,7 +328,7 @@
                  [(_ foo e1 e2) e1] ...
                  [(_ bar e1 e2) e2]))))])))
 
-(define-constant scheme-version #x00090507)
+(define-constant scheme-version #x00090508)
 
 (define-syntax define-machine-types
   (lambda (x)
diff --git a/scheme.1.in b/scheme.1.in
index 94e550b8..7c54c3f0 100644
--- a/scheme.1.in
+++ b/scheme.1.in
@@ -3,7 +3,7 @@
 .if t .ds c caf\o'\'e'
 .if n .ds c cafe
 .ds ]W 
-.TH SCHEME 1 "Chez Scheme Version 9.5.7 November 2021"
+.TH SCHEME 1 "Chez Scheme Version 9.5.8 April 2022"
 .SH NAME
 \fIChez Scheme\fP
 .br
@@ -794,6 +794,6 @@ Second Edition\fP,
 MIT press (1996).
 .in -5
 .SH AUTHOR
-Copyright 2021 Cisco Systems, Inc.
+Copyright 2022 Cisco Systems, Inc.
 Licensed under the Apache License, Version 2.0
 (http://www.apache.org/licenses/LICENSE-2.0)
diff --git a/wininstall/Makefile b/wininstall/Makefile
index 8dbbdebc..e7459218 100644
--- a/wininstall/Makefile
+++ b/wininstall/Makefile
@@ -1,4 +1,4 @@
-VERSION := 9.5.7
+VERSION := 9.5.8
 WIXEXTENSIONS := -ext WixUIExtension -ext WixBalExtension
 export MSYS_NO_PATHCONV=1
 
diff --git a/wininstall/a6nt.wxs b/wininstall/a6nt.wxs
index 617768ab..3070dc44 100644
--- a/wininstall/a6nt.wxs
+++ b/wininstall/a6nt.wxs
@@ -4,16 +4,16 @@
     <DirectoryRef Id="D_bin">
       <Directory Id="D_bin_a6nt" Name="a6nt">
         <Component Id="cmp9E121291956F53F264990A9F6E93E67D" Guid="*">
-          <File Id="fil174DC3B31231BE75291782CBF71B1ECB" KeyPath="yes" Source="..\a6nt\bin\a6nt\csv957.dll" />
+          <File Id="fil174DC3B31231BE75291782CBF71B1ECB" KeyPath="yes" Source="..\a6nt\bin\a6nt\csv958.dll" />
         </Component>
         <Component Id="cmpDB181AE3BD838D4F431CAE12DB40B70A" Guid="*">
-          <File Id="fil53D3BD37CECBBF28D1DB95A8B750DBDC" KeyPath="yes" Source="..\a6nt\bin\a6nt\csv957.exp" />
+          <File Id="fil53D3BD37CECBBF28D1DB95A8B750DBDC" KeyPath="yes" Source="..\a6nt\bin\a6nt\csv958.exp" />
         </Component>
         <Component Id="cmp0B0A70880E3C505B199705D415235AC7" Guid="*">
-          <File Id="fil69E98A18AB5AD3061617C9E68F536773" KeyPath="yes" Source="..\a6nt\bin\a6nt\csv957.lib" />
+          <File Id="fil69E98A18AB5AD3061617C9E68F536773" KeyPath="yes" Source="..\a6nt\bin\a6nt\csv958.lib" />
         </Component>
         <Component Id="cmp41C1093548579E6BE087DD4BE735B7C5" Guid="*">
-          <File Id="fil11683117A53DD772D9B6F0C11BE06C7C" KeyPath="yes" Source="..\a6nt\bin\a6nt\csv957.pdb" />
+          <File Id="fil11683117A53DD772D9B6F0C11BE06C7C" KeyPath="yes" Source="..\a6nt\bin\a6nt\csv958.pdb" />
         </Component>
         <Component Id="cmpD50999EDF5C2480D6F6F6A04E6B127F3" Guid="*">
           <File Id="filE439E2DE55CFE1366273AF3E232D4519" KeyPath="yes" Source="..\a6nt\bin\a6nt\petite.exe" />
@@ -40,10 +40,10 @@
     <DirectoryRef Id="D_boot">
       <Directory Id="D_boot_a6nt" Name="a6nt">
         <Component Id="cmpB8AFC5E7298C4FB423F21E474D718248" Guid="*">
-          <File Id="filAA3DCFC2962A0A679D26BAEF2EE45D18" KeyPath="yes" Source="..\a6nt\boot\a6nt\csv957md.lib" />
+          <File Id="filAA3DCFC2962A0A679D26BAEF2EE45D18" KeyPath="yes" Source="..\a6nt\boot\a6nt\csv958md.lib" />
         </Component>
         <Component Id="cmp41A0F324C636C03565EFAB5DC1197958" Guid="*">
-          <File Id="fil0052F236986BD25DFE0D0DE76854483B" KeyPath="yes" Source="..\a6nt\boot\a6nt\csv957mt.lib" />
+          <File Id="fil0052F236986BD25DFE0D0DE76854483B" KeyPath="yes" Source="..\a6nt\boot\a6nt\csv958mt.lib" />
         </Component>
         <Component Id="cmp08025CB77BA01465D21171D27231AE6A" Guid="*">
           <File Id="fil7FF609B8D0F6C6E984910D4458F7B76B" KeyPath="yes" Source="..\a6nt\boot\a6nt\mainmd.obj" />
diff --git a/wininstall/i3nt.wxs b/wininstall/i3nt.wxs
index 8cc2cac1..532d4620 100644
--- a/wininstall/i3nt.wxs
+++ b/wininstall/i3nt.wxs
@@ -4,16 +4,16 @@
     <DirectoryRef Id="D_bin">
       <Directory Id="D_bin_i3nt" Name="i3nt">
         <Component Id="cmp3EAD5F342D86023E323C2F3E96A596B9" Guid="*">
-          <File Id="filF35C82CDA44DE51CEFA9FF8CA1B38AAA" KeyPath="yes" Source="..\i3nt\bin\i3nt\csv957.dll" />
+          <File Id="filF35C82CDA44DE51CEFA9FF8CA1B38AAA" KeyPath="yes" Source="..\i3nt\bin\i3nt\csv958.dll" />
         </Component>
         <Component Id="cmpF2410A7AF5FB7C10A33DA57476B0E56B" Guid="*">
-          <File Id="filFE4E60D4DD4AEF0DDA574E6EF117FEC0" KeyPath="yes" Source="..\i3nt\bin\i3nt\csv957.exp" />
+          <File Id="filFE4E60D4DD4AEF0DDA574E6EF117FEC0" KeyPath="yes" Source="..\i3nt\bin\i3nt\csv958.exp" />
         </Component>
         <Component Id="cmp905F254ECBC3BCB861BBBF60B0F34D73" Guid="*">
-          <File Id="fil811C8A53860477F59CD4D11BF7C36A5E" KeyPath="yes" Source="..\i3nt\bin\i3nt\csv957.lib" />
+          <File Id="fil811C8A53860477F59CD4D11BF7C36A5E" KeyPath="yes" Source="..\i3nt\bin\i3nt\csv958.lib" />
         </Component>
         <Component Id="cmp43EE1BA94E7D15B5F9721D32B41CDFF1" Guid="*">
-          <File Id="fil3475AECC40E6C77A1E5A74C81205D246" KeyPath="yes" Source="..\i3nt\bin\i3nt\csv957.pdb" />
+          <File Id="fil3475AECC40E6C77A1E5A74C81205D246" KeyPath="yes" Source="..\i3nt\bin\i3nt\csv958.pdb" />
         </Component>
         <Component Id="cmp2660425B08191D07FD2B8E4D12C25CAF" Guid="*">
           <File Id="fil6C14AF587FDAABD1440BADC640EEF64E" KeyPath="yes" Source="..\i3nt\bin\i3nt\petite.exe" />
@@ -40,10 +40,10 @@
     <DirectoryRef Id="D_boot">
       <Directory Id="D_boot_i3nt" Name="i3nt">
         <Component Id="cmp47E339F22F1D268C3D889C89DC04B1EC" Guid="*">
-          <File Id="filFAE795432021A108F72A5A1763549848" KeyPath="yes" Source="..\i3nt\boot\i3nt\csv957md.lib" />
+          <File Id="filFAE795432021A108F72A5A1763549848" KeyPath="yes" Source="..\i3nt\boot\i3nt\csv958md.lib" />
         </Component>
         <Component Id="cmp97E86E3E78EC5C1E35333413F9D239A9" Guid="*">
-          <File Id="filC2A38DD4D83F793279D6D10E8D553145" KeyPath="yes" Source="..\i3nt\boot\i3nt\csv957mt.lib" />
+          <File Id="filC2A38DD4D83F793279D6D10E8D553145" KeyPath="yes" Source="..\i3nt\boot\i3nt\csv958mt.lib" />
         </Component>
         <Component Id="cmp4EC08D9AF0D6DADE3077A7EB099476B4" Guid="*">
           <File Id="fil47E4EBA05B181E80FAF43A5B84DCC1D6" KeyPath="yes" Source="..\i3nt\boot\i3nt\mainmd.obj" />
diff --git a/wininstall/ta6nt.wxs b/wininstall/ta6nt.wxs
index e8012269..031b6c47 100644
--- a/wininstall/ta6nt.wxs
+++ b/wininstall/ta6nt.wxs
@@ -4,16 +4,16 @@
     <DirectoryRef Id="D_bin">
       <Directory Id="D_bin_ta6nt" Name="ta6nt">
         <Component Id="cmpA67EF6318D00B4209BFCD0BFDCDF781C" Guid="*">
-          <File Id="fil6AE7892DB37FF6D2C21B5EC064C90DE5" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\csv957.dll" />
+          <File Id="fil6AE7892DB37FF6D2C21B5EC064C90DE5" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\csv958.dll" />
         </Component>
         <Component Id="cmpF41FF9DE554F79FB6FBD85E5B80A5221" Guid="*">
-          <File Id="fil9157F8FB18F1F75BE50A64A9C227BF61" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\csv957.exp" />
+          <File Id="fil9157F8FB18F1F75BE50A64A9C227BF61" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\csv958.exp" />
         </Component>
         <Component Id="cmp372F759C97C3C69E4C336B81D807E4F5" Guid="*">
-          <File Id="fil602A8BBB83416294672AA22507E6452A" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\csv957.lib" />
+          <File Id="fil602A8BBB83416294672AA22507E6452A" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\csv958.lib" />
         </Component>
         <Component Id="cmp009F56824D2716FAAC978FE17A4D947D" Guid="*">
-          <File Id="filDD0E7D06D27FC4C00388CB48E4B2818C" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\csv957.pdb" />
+          <File Id="filDD0E7D06D27FC4C00388CB48E4B2818C" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\csv958.pdb" />
         </Component>
         <Component Id="cmp50972D99EC9DDA63E4BC6E29DAA592D0" Guid="*">
           <File Id="fil8A260A0B8935F8F9011AA2EDB9147BDE" KeyPath="yes" Source="..\ta6nt\bin\ta6nt\petite.exe" />
@@ -40,10 +40,10 @@
     <DirectoryRef Id="D_boot">
       <Directory Id="D_boot_ta6nt" Name="ta6nt">
         <Component Id="cmpCBDB945622604667783C3C57A0427DF5" Guid="*">
-          <File Id="filD3E4E45F8404EE812C5DAFCBEB2502AA" KeyPath="yes" Source="..\ta6nt\boot\ta6nt\csv957md.lib" />
+          <File Id="filD3E4E45F8404EE812C5DAFCBEB2502AA" KeyPath="yes" Source="..\ta6nt\boot\ta6nt\csv958md.lib" />
         </Component>
         <Component Id="cmpD7880184C113065E511275EFD531D589" Guid="*">
-          <File Id="filDC2D7E1DB036BAE5B7FFA7FE14F3CD69" KeyPath="yes" Source="..\ta6nt\boot\ta6nt\csv957mt.lib" />
+          <File Id="filDC2D7E1DB036BAE5B7FFA7FE14F3CD69" KeyPath="yes" Source="..\ta6nt\boot\ta6nt\csv958mt.lib" />
         </Component>
         <Component Id="cmp5211817ED85951CDAF2FD5E2419BD211" Guid="*">
           <File Id="fil21839A8D4062A72DEAB3156D77EEE82A" KeyPath="yes" Source="..\ta6nt\boot\ta6nt\mainmd.obj" />
diff --git a/wininstall/ti3nt.wxs b/wininstall/ti3nt.wxs
index 442f141e..fa02d798 100644
--- a/wininstall/ti3nt.wxs
+++ b/wininstall/ti3nt.wxs
@@ -4,16 +4,16 @@
     <DirectoryRef Id="D_bin">
       <Directory Id="D_bin_ti3nt" Name="ti3nt">
         <Component Id="cmp3E51840FF941B7410025EFB2215EAB58" Guid="*">
-          <File Id="fil6B96E8682034EC96C7842C5024FDF620" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\csv957.dll" />
+          <File Id="fil6B96E8682034EC96C7842C5024FDF620" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\csv958.dll" />
         </Component>
         <Component Id="cmp68BA21E76800BFFA057D33973E89D8F4" Guid="*">
-          <File Id="fil5F505E9200C84F7887C4D12FA9D9D794" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\csv957.exp" />
+          <File Id="fil5F505E9200C84F7887C4D12FA9D9D794" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\csv958.exp" />
         </Component>
         <Component Id="cmpCA1F1C55C49A3A332E60F8D0D78363C2" Guid="*">
-          <File Id="filB8607D2BF295249DD6F51070A687E14B" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\csv957.lib" />
+          <File Id="filB8607D2BF295249DD6F51070A687E14B" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\csv958.lib" />
         </Component>
         <Component Id="cmp01D266C0ECE540BE4BF6E6AE14AFFCBB" Guid="*">
-          <File Id="filE99735E84B4934FC41AAA6BBF547F1C5" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\csv957.pdb" />
+          <File Id="filE99735E84B4934FC41AAA6BBF547F1C5" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\csv958.pdb" />
         </Component>
         <Component Id="cmpC00FD9C7415A1D2D22EA38F5259CAAA4" Guid="*">
           <File Id="fil80D2F31CB0D3B8F98E3C8CCAF9DA6F29" KeyPath="yes" Source="..\ti3nt\bin\ti3nt\petite.exe" />
@@ -40,10 +40,10 @@
     <DirectoryRef Id="D_boot">
       <Directory Id="D_boot_ti3nt" Name="ti3nt">
         <Component Id="cmp7099C9EB3F487AAFE3A880CED21FA9C2" Guid="*">
-          <File Id="filD5DA8D84F54BC985AA246BBD3FB15239" KeyPath="yes" Source="..\ti3nt\boot\ti3nt\csv957md.lib" />
+          <File Id="filD5DA8D84F54BC985AA246BBD3FB15239" KeyPath="yes" Source="..\ti3nt\boot\ti3nt\csv958md.lib" />
         </Component>
         <Component Id="cmpF3038779EA05930E72A29C15DC2D64B2" Guid="*">
-          <File Id="filFB335FE01A6D5ED27AD2BC179DB8E265" KeyPath="yes" Source="..\ti3nt\boot\ti3nt\csv957mt.lib" />
+          <File Id="filFB335FE01A6D5ED27AD2BC179DB8E265" KeyPath="yes" Source="..\ti3nt\boot\ti3nt\csv958mt.lib" />
         </Component>
         <Component Id="cmp9DDE0523EFC5EEA983DE3CFA0F493908" Guid="*">
           <File Id="fil139F59D34D1A013CCB2AEC11507287AA" KeyPath="yes" Source="..\ti3nt\boot\ti3nt\mainmd.obj" />
diff --git a/workarea b/workarea
index 4d8f1959..c6879973 100755
--- a/workarea
+++ b/workarea
@@ -206,8 +206,8 @@ case $M in
   *nt)
     (cd $W/boot/$M; workln ../../../boot/$M/mainmd.obj mainmd.obj)
     (cd $W/boot/$M; workln ../../../boot/$M/mainmt.obj mainmt.obj)
-    (cd $W/boot/$M; workln ../../../boot/$M/csv957md.lib csv957md.lib)
-    (cd $W/boot/$M; workln ../../../boot/$M/csv957mt.lib csv957mt.lib)
+    (cd $W/boot/$M; workln ../../../boot/$M/csv958md.lib csv958md.lib)
+    (cd $W/boot/$M; workln ../../../boot/$M/csv958mt.lib csv958mt.lib)
     (cd $W/boot/$M; workln ../../../boot/$M/scheme.res scheme.res)
     ;;
   *)
@@ -222,8 +222,8 @@ case $M in
   *nt)
     (cd $W/bin/$M; workln ../../../bin/$M/scheme.exe scheme.exe)
     (cd $W/bin/$M; forceworkln2 scheme.exe petite.exe)
-    (cd $W/bin/$M; workln ../../../bin/$M/csv957.dll csv957.dll)
-    (cd $W/bin/$M; workln ../../../bin/$M/csv957.lib csv957.lib)
+    (cd $W/bin/$M; workln ../../../bin/$M/csv958.dll csv958.dll)
+    (cd $W/bin/$M; workln ../../../bin/$M/csv958.lib csv958.lib)
     ;;
   *)
     (cd $W/bin/$M; workln ../../../bin/$M/scheme scheme)