diff --git a/Makefile b/Makefile
index 20629a29..0d281db7 100755
--- a/Makefile
+++ b/Makefile
@@ -638,14 +638,14 @@ bin-image: ok bin-md5list $(OUT)
 	cd $(BDIR); opts=`cat $(CD).mkisofs_opts`; \
 	 volid=`cat $(CD).volid`; rm -f $(OUT)/$(CODENAME)-$(ARCH)-$(CD).raw; \
 	  $(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
-	  -o $(OUT)/$(CODENAME)-$(ARCH)-$(CD).raw $$opts $(CD)
+	  -o $(OUT)/$(CODENAME)-$(ARCH)-$(CD).raw $$opts CD$(CD)
 src-image: ok src-md5list $(OUT)
 	@echo "Generating the source iso image n°$(CD) ..."
 	@test -n "$(CD)" || (echo "Give me a CD=<num> parameter !" && false)
 	cd $(SDIR); opts=`cat $(CD).mkisofs_opts`; \
 	 volid=`cat $(CD).volid`; rm -f $(OUT)/$(CODENAME)-src-$(CD).raw; \
          $(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
-	  -o $(OUT)/$(CODENAME)-src-$(CD).raw $$opts $(CD)
+	  -o $(OUT)/$(CODENAME)-src-$(CD).raw $$opts CD$(CD)
 
 
 #Calculate the md5sums for the images
diff --git a/debian/changelog b/debian/changelog
index f5ef3d93..4f944d3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debian-cd (2.2.2) frozen unstable; urgency=low
+
+  * Still targeted to frozen. Documentations (README.html on the CD) updates
+    & other little changes. 
+  * Fixed targets bin-image and src-image to use CD$(CD) instead of $(CD).
+
+ -- Raphael Hertzog <hertzog@debian.org>  Fri, 30 Jun 2000 17:50:16 +0200
+
 debian-cd (2.2.1) frozen unstable; urgency=low
 
   * Should go to frozen as well...