diff --git a/src/deforaos-build.sh b/src/deforaos-build.sh
index 68901b4..0198bb1 100755
--- a/src/deforaos-build.sh
+++ b/src/deforaos-build.sh
@@ -5,11 +5,20 @@
 
 #variables
 [ -z "$ARCH" ] && ARCH=`uname -m`
+case "$ARCH" in
+	i486|i586|i686)
+		ARCH="i386"
+		;;
+	x86_64)
+		ARCH="amd64"
+		;;
+esac
 [ -z "$CVSROOT" ] && CVSROOT=":pserver:anonymous@anoncvs.defora.org:/Data/CVS"
 [ -z "$OS" ] && OS=`uname -s`
 #private
 DESTDIR="/var/www/htdocs/download/snapshots"
 DEVNULL="/dev/null"
+FILE="DeforaOS-daily.iso"
 MODULE="DeforaOS"
 PREFIX="/usr"
 SRC="$HOME/build/$OS-$ARCH"
@@ -17,6 +26,7 @@ DST="$HOME/destdir/$OS-$ARCH"
 
 #executables
 CP="cp -f"
+CONFIGURE="Apps/Devel/src/configure/src/configure -O DeforaOS"
 CVS="cvs -q"
 MAKE="make"
 MKDIR="mkdir -p"
@@ -37,16 +47,6 @@ error()
 
 
 #main
-#check variables
-case "$ARCH" in
-	i*86)
-		ARCH="i386"
-		;;
-	x86_64)
-		ARCH="amd64"
-		;;
-esac
-
 #configure cvs if necessary
 [ ! -f "$HOME/.cvspass" ] && touch "$HOME/.cvspass"
 
@@ -67,22 +67,23 @@ $MKDIR "$DST"							|| error
 echo ""
 echo "Configuring CVS module $MODULE:"
 cd "$SRC"							|| error
-$MAKE DESTDIR="$DST" < "$DEVNULL"				|| error
+$MAKE DESTDIR="$DST" PREFIX="$PREFIX" bootstrap < "$DEVNULL"	|| error
 
 #build
 echo ""
 echo "Building CVS module $MODULE:"
-./build.sh MAKE="$MAKE" DESTDIR="$DST" PREFIX="$PREFIX" install	|| error
+./build.sh CONFIGURE="$CONFIGURE" MAKE="$MAKE" DESTDIR="$DST" PREFIX="$PREFIX" \
+		      all					|| error
 
 #create CD-ROM image
 echo ""
 echo "Creating CD-ROM image:"
-./build.sh MAKE="$MAKE" DESTDIR="$DST" PREFIX="$PREFIX" \
+./build.sh CONFIGURE="$CONFIGURE" MAKE="$MAKE" DESTDIR="$DST" PREFIX="$PREFIX" \
 		IMAGE_TYPE="ramdisk" IMAGE_FILE="initrd.img" IMAGE_SIZE=8192 \
 		IMAGE_MODULES="/usr/src/linux-2.4.37/modules-ramdisk.tgz" \
 		image						|| error
 $RM -r "$DST"
-./build.sh MAKE="$MAKE" DESTDIR="$DST" PREFIX="$PREFIX" \
+./build.sh CONFIGURE="$CONFIGURE" MAKE="$MAKE" DESTDIR="$DST" PREFIX="$PREFIX" \
 		IMAGE_TYPE="iso" \
 		IMAGE_FILE="DeforaOS-daily.iso" \
 		IMAGE_KERNEL="/usr/src/linux-2.4.37/arch/i386/boot/bzImage" \
@@ -90,8 +91,8 @@ $RM -r "$DST"
 		IMAGE_RAMDISK="initrd.img" \
 		KERNEL_ARGS="vga=0x301 rw" \
 		image						|| error
-$CP "DeforaOS-daily.iso" "$DESTDIR"				|| error
-echo "http://www.defora.org/download/snapshots/DeforaOS-daily.tar.gz"
+$CP "$FILE" "$DESTDIR"						|| error
+echo "http://www.defora.org/download/snapshots/$FILE"
 
 #cleanup
 $RM -r "$SRC"