diff --git a/Makefile b/Makefile
index 61b31d61e1..a57e7d10cf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,15 @@
 BUILD_DIRS="build.*"
 
-all: image
+all: system
 
-image:
-	./scripts/install image full
+system:
+	./scripts/install image system
+
+qemu:
+	./scripts/install image qemu
 
 clean:
 	rm -rf $(BUILD_DIRS)
 
 src-pkg:
-	tar cvjf sources.tar.bz2 sources .stamps
\ No newline at end of file
+	tar cvjf sources.tar.bz2 sources .stamps
diff --git a/packages/virtual/image/install b/packages/virtual/image/install
index 1a18b8add1..bf1dad4020 100755
--- a/packages/virtual/image/install
+++ b/packages/virtual/image/install
@@ -88,14 +88,17 @@ case "$2" in
 
     mkdir -p $ROOT/target
       rm -rf $ROOT/target/$PROJECT-$MEDIACENTER-$OPENELEC_VERSION.kernel
-      cp build.$PROJECT.*/linux-*/arch/x86/boot/bzImage $ROOT/target/$PROJECT-$MEDIACENTER-$OPENELEC_VERSION.kernel
+      cp -PR $BUILD/linux-*/arch/x86/boot/bzImage $ROOT/target/$PROJECT-$MEDIACENTER-$OPENELEC_VERSION.kernel
     
       rm -rf $ROOT/target/$PROJECT-$MEDIACENTER-$OPENELEC_VERSION.$2
       $ROOT/$TOOLCHAIN/bin/mksquashfs $INSTALL $ROOT/target/$PROJECT-$MEDIACENTER-$OPENELEC_VERSION.$2 -noappend -all-root
 #     $ROOT/$TOOLCHAIN/bin/mkfs.axfs $INSTALL openelec.$2
   ;;
 
-  img)
+  qemu)
+
+    $SCRIPTS/install image system
+
     mkdir -p $ROOT/target
       rm -rf $ROOT/target/$PROJECT-$MEDIACENTER-$OPENELEC_VERSION-qemu.flash
       qemu-img create -f raw $ROOT/target/$PROJECT-$MEDIACENTER-$OPENELEC_VERSION-qemu.flash 50M
@@ -112,9 +115,4 @@ case "$2" in
 
   ;;
 
-  full)
-
-    $SCRIPTS/install image system
-    $SCRIPTS/install image img
-  ;;
 esac