diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index 88fca97625..02f26937d7 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -433,26 +433,22 @@ sub runone {
     # build a full install .rockbox directory
     buildzip($target, $fonts);
 
-    # create a zip file from the .rockbox dfir
-
     unlink($output);
-    if($verbose) {
-      print "$ziptool $output .rockbox >/dev/null\n";
-    }
-    system("$ziptool $output .rockbox >/dev/null");
 
-    if($target && ($fonts != 1)) {
-        # On some targets, rockbox.* is inside .rockbox
-        if($target !~ /(mod|ajz|wma)\z/i) {
-            copy("$target", ".rockbox/$target");
-            $target = ".rockbox/".$target;
-        }
-        
-        if($verbose) {
-            print "$ziptool $output $target >/dev/null\n";
-        }
-        system("$ziptool $output $target >/dev/null");
+    if($fonts == 1) {
+        # Don't include image file in fonts-only package
+        undef $target;
     }
+    if($target && ($target !~ /(mod|ajz|wma)\z/i)) {
+        # On some targets, the image goes into .rockbox.
+        copy("$target", ".rockbox/$target");
+        undef $target;
+    }
+
+    if($verbose) {
+        print "$ziptool $output .rockbox $target >/dev/null\n";
+    }
+    system("$ziptool $output .rockbox $target >/dev/null");
 
     # remove the .rockbox afterwards
     rmtree('.rockbox');
diff --git a/tools/configure b/tools/configure
index 327ae15230..728d4d39fd 100755
--- a/tools/configure
+++ b/tools/configure
@@ -2346,7 +2346,7 @@ fullzip:
 tar:
 	\$(SILENT)rm -f rockbox.tar
 	\$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done; \\
-	\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(MODELNAME)\$\$feat\" -i \"\$(TARGET_ID)\"  -o "rockbox.tar" -z "tar -uf" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
+	\$(TOOLSDIR)/buildzip.pl \$(VERBOSEOPT) -t \"\$(MODELNAME)\$\$feat\" -i \"\$(TARGET_ID)\"  -o "rockbox.tar" -z "tar -cf" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY)
 
 bzip2: tar
 	\$(SILENT)bzip2 -f9 rockbox.tar