diff --git a/README b/README
index e95430c7..be6bff68 100644
--- a/README
+++ b/README
@@ -76,6 +76,12 @@ The process of building a CD is decomposed as follow :
   tree. If you can't do this, you'll have to use the symlink farm.
   The symlink farm is explained at the end of this README.
 
+  Keep in mind that the environment variables will stay in the
+  environment after your debian-cd run, and may interfere with
+  other program using the same variables (kernel-package for
+  example ...). So if you want to be 100% safe, run debian-cd in a
+  separate shell that you exit afterwards.
+  
 - let's clean everything that may still be there from previous runs :
   $ make distclean
 
diff --git a/debian/changelog b/debian/changelog
index c15a8cb8..9db73d0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ debian-cd (2.2.10) unstable; urgency=low
     You must export MULTIBOOT="yes" in CONF.sh  to enable this feature. -jwest
   * Removed "ide" boot floppy's flavor. Closes: #120415
   * Added support for s390 (Jochen Röhrig <jr@debian.org>).
+  * Documentation about the fact the environment variables may
+    pollute your environment after a debian-cd run. Closes: #123289
 
- -- Jochen Röhrig <jr@debian.org>  Mon, 26 Nov 2001 18:21:50 +0100
+ -- Raphael Hertzog <hertzog@debian.org>  Mon, 26 Nov 2001 18:21:50 +0100
 
 debian-cd (2.2.9) unstable; urgency=low