diff --git a/copy-files.sh b/copy-files.sh
index 43d6554..37596f6 100755
--- a/copy-files.sh
+++ b/copy-files.sh
@@ -41,7 +41,7 @@ for FILE in `cat proprietary-files.txt | grep -v ^# | grep -v ^$`; do
     if [ ! -d $BASE/$DIR ]; then
         mkdir -p $BASE/$DIR
     fi
-    cp $STAGESYS/$FILE -d $BASE
+    cp $STAGESYS/$FILE $BASE/$FILE
 done
 
 ./setup-makefiles.sh
diff --git a/unzip-files.sh b/unzip-files.sh
index 83c4a7a..09804b9 100755
--- a/unzip-files.sh
+++ b/unzip-files.sh
@@ -26,7 +26,7 @@ for FILE in `cat proprietary-files.txt | grep -v ^# | grep -v ^$`; do
     if [ ! -d $BASE/$DIR ]; then
         mkdir -p $BASE/$DIR
     fi
-    unzip -j -o ../../../${DEVICE}_update.zip system/$FILE -d $BASE
+    unzip -j -o ../../../${DEVICE}_update.zip system/$FILE -d $BASE/$DIR
 done
 
 ./setup-makefiles.sh