diff --git a/rootfs.mk b/rootfs.mk
index 2c7d1a1..3aee89a 100644
--- a/rootfs.mk
+++ b/rootfs.mk
@@ -5,7 +5,7 @@
 include $(ROOTDIR)/build/preamble.mk
 
 ROOTFS_DIR := $(PRODUCT_OUT)/obj/ROOTFS/rootfs
-ROOTFS_RAW_IMG := $(ROOTDIR)/cache/rootfs.raw.img
+ROOTFS_RAW_IMG := $(PRODUCT_OUT)/obj/ROOTFS/rootfs.raw.img
 ROOTFS_PATCHED_IMG := $(PRODUCT_OUT)/obj/ROOTFS/rootfs.patched.img
 
 ROOTFS_FETCH_TARBALL ?= true
@@ -91,8 +91,8 @@
                        | $(PRODUCT_OUT)/boot.img \
                          modules \
                          packages
-	mkdir -p $(ROOTFS_DIR)
 	cp -r $(ROOTFS_RAW_IMG) $(ROOTFS_PATCHED_IMG)
+	mkdir -p $(ROOTFS_DIR)
 	-sudo umount $(ROOTFS_DIR)/boot
 	-sudo umount $(ROOTFS_DIR)
 	sudo mount -o loop $(ROOTFS_PATCHED_IMG) $(ROOTFS_DIR)