Couple of small fixes for joeyh's and my latest commits.

Makefile

@@ -1009,7 +1009,7 @@ src-image: ok src-md5list $(OUT)
 	 relname=`echo $(DEBVERSION) | sed -e 's/[. ]//g'`; \
 	 rm -f $(OUT)/debian-$$relname-source-$(CD).raw; \
          $(MKISOFS) $(MKISOFS_OPTS) -V "$$volid" \
-	  -o $(OUT)/debian-$relname-source-$(CD).raw $$opts CD$(CD)
+	  -o $(OUT)/debian-$$relname-source-$(CD).raw $$opts CD$(CD)
 
 
 #Calculate the md5sums for the images (if available), or get from templates

tools/generate_di+k_list

@@ -18,7 +18,7 @@ cat > debian-installer+kernel-$CODENAME << EOF
  * Last update: $DATE
  */
 
-#include <debian-installer>
+#include <debian-installer-$CODENAME>
 eject
 locales
 lvm10