diff --git a/NEWS b/NEWS
index fc58c02c0..fc80a4c18 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,15 @@ Changes since Guile 1.4:
 
 * Changes to the distribution
 
+** The module (ice-9 and-let*) has been renamed to (ice-9 and-let-star)
+
+This has been done to prevent problems on lesser operating systems
+that can't tolerate `*'s in file names.  The exported macro continues
+to be named `and-let*', of course.
+
+On systems that support it, there is also a compatability module named
+(ice-9 and-let*).  It will go away in the next release.
+   
 ** New modules (oop goops) etc.:
 
   (oop goops)
diff --git a/RELEASE b/RELEASE
index 551af20e3..0995419fd 100644
--- a/RELEASE
+++ b/RELEASE
@@ -7,6 +7,10 @@ absinthe, etc.  However, the first release containing the module
 system should be called Godot: "This is the one you've been waiting
 for."
 
+* Remove compatability module (ice-9 and-let*) eventually (when a
+  major release with the real module (ice-9 and-let-star) has been out
+  long enough, probably release 1.6).
+
 * Deprecate `read-only-string?'.
 
 After signal handling and threading have been fixed:
diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index 6ac39d8f7..4823b0097 100644
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -1,3 +1,17 @@
+2001-02-04  Marius Vollmer  <mvo@zagadka.ping.de>
+
+	Avoid the use of "*" in file names for the benefit of lesser
+	operating systems.
+	
+	* and-let-star.scm, and-let*.scm: Renamed `and-let*.scm' to
+	`and-let-star.scm'.  Updated module name as well.
+	* and-let-star-compat.scm: New file, installed as `and-let*.scm'.
+	* Makefile.am (ice9_sources): Replaced "and-let*.scm" with
+	"and-let-star.scm".
+	(install-data-local): Install "and-let-star-compat.scm" as
+	"and-let*.scm", ignoring errors.
+	(EXTRA_DIST): Distribute `and-let-star-compat.scm'.
+	
 2001-01-26  Dirk Herrmann  <D.Herrmann@tu-bs.de>
 
 	This patch fixes a problem reported by Martin Grabmueller about