diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index cb0c2b2f0a..22a706224f 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -306,36 +306,46 @@ sub filesize {
 }
 
 sub create_failsafefiles {
-    my ($dir) = @_;
+    my ($dir, $remote_depth) = @_;
     my $text = "# Dummy file to allow Rockbox to reset to the default skin config.
 # Do not edit this file.  It's never actually loaded by Rockbox.";
     open (FOO, ">$dir/wps/rockbox_failsafe.wps");
     print FOO $text;
     close(FOO);
-    open (FOO, ">$dir/wps/rockbox_failsafe.rwps");
-    print FOO $text;
-    close(FOO);
     open (FOO, ">$dir/wps/rockbox_failsafe.sbs");
     print FOO $text;
     close(FOO);
-    open (FOO, ">$dir/wps/rockbox_failsafe.rsbs");
-    print FOO $text;
-    close(FOO);
     open (FOO, ">$dir/wps/rockbox_failsafe.fms");
     print FOO $text;
     close(FOO);
-    open (FOO, ">$dir/wps/rockbox_failsafe.rfms");
-    print FOO $text;
-    close(FOO);
+    if ($remote_depth) {
+        open (FOO, ">$dir/wps/rockbox_failsafe.rwps");
+        print FOO $text;
+        close(FOO);
+        open (FOO, ">$dir/wps/rockbox_failsafe.rsbs");
+        print FOO $text;
+        close(FOO);
+        open (FOO, ">$dir/wps/rockbox_failsafe.rfms");
+        print FOO $text;
+        close(FOO);
+    }
     open (FOO, ">$dir/themes/rockbox_failsafe.cfg");
     print FOO <<STOP
 # This config has been autogenerated to reload the failsafe setup
 wps: $dir/wps/rockbox_failsafe.wps
-rwps: $dir/wps/rockbox_failsafe.rwps
 sbs: $dir/wps/rockbox_failsafe.sbs
-rsbs: $dir/wps/rockbox_failsafe.rsbs
 fms: $dir/wps/rockbox_failsafe.fms
+STOP
+;
+    if ($remote_depth) {
+    print FOO <<STOP
+rwps: $dir/wps/rockbox_failsafe.rwps
+rsbs: $dir/wps/rockbox_failsafe.rsbs
 rfms: $dir/wps/rockbox_failsafe.rfms
+STOP
+;
+    }
+    print FOO <<STOP
 statusbar: top
 font: 08-Schumacher-Clean.fnt
 foreground color: 000000
@@ -549,7 +559,7 @@ STOP
              "$temp_dir/rocks/demos/pictureflow_splash.bmp");
 
     }
-    create_failsafefiles($temp_dir);
+    create_failsafefiles($temp_dir, $remote_depth);
 
     if($image) {
         # image is blank when this is a simulator