diff --git a/BaseBuild/makeall b/BaseBuild/makeall
index 11aab87..58429cf 100755
--- a/BaseBuild/makeall
+++ b/BaseBuild/makeall
@@ -130,9 +130,10 @@ mv ViitorInstall install
 cd install
 ./GenPkgList $DISTTARGET >$DISTTARGET/.pkglist
 $VMAKEDIR/Scripts/GenBaseCfg >BaseDevel.cfg
-$VMAKEDIR/Scripts/GenBuildList >All.cfg`
+$VMAKEDIR/Scripts/GenBuildList >All.cfg
 chmod 755 *
-cd genCD
+cd ../genCD
+BINDIR=`basename $DISTTARGET`
 sed -i "s/BINARY/$BINDIR/g" .genCD_Functions
 chmod 755 *
 cd ..
@@ -142,7 +143,7 @@ if [ "$CVSASK" ]; then
 	read
 fi
 svn co $SVNURL/Viitor_cdboot
-mv Viitor_cdboot/$BOOTDIR boot
+mv Viitor_cdboot/isolinux boot
 rm -r Viitor_cdboot
 umount /tmp
 umount /dev/pts