diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index 094214d..9f48dd1 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -305,6 +305,47 @@ sub filesize {
     return $size;
 }

+sub create_failsafefiles {
+    my ($dir) = @_;
+    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);
+    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
+rfms: $dir/wps/rockbox_failsafe.rfms
+statusbar: top
+font: 08-Schumacher-Clean.fnt
+foreground color: 000000
+background color: B6C6E5
+selector type: bar (inverse)
+STOP
+;
+    close(FOO);
+}
+
 sub buildzip {
     my ($image, $fonts)=@_;
     my $libdir = $install;
@@ -508,6 +549,7 @@ STOP
              "$temp_dir/rocks/demos/pictureflow_splash.bmp");

     }
+    create_failsafefiles($temp_dir);

     if($image) {
         # image is blank when this is a simulator
@@ -572,7 +614,6 @@ STOP
     } else {
         copy("$ROOT/wps/classic_statusbar.112x64x1.sbs", "$temp_dir/wps/classic_statusbar.sbs");
     }
-    system("touch $temp_dir/wps/rockbox_none.sbs");
     if ($remote_depth != $depth) {
 		copy("$ROOT/wps/classic_statusbar.mono.sbs", "$temp_dir/wps/classic_statusbar.rsbs");
 	} else {
diff --git a/wps/WPSLIST b/wps/WPSLIST
index e382368..362df12 100644
--- a/wps/WPSLIST
+++ b/wps/WPSLIST
@@ -42,23 +42,6 @@ selector type: bar (inverse)
 </wps>

 <wps>
-Name: rockbox_default.wps
-RWPS: rockbox_default.rwps
-SBS:
-RSBS:
-Author: Rockbox team
-Font: 08-Schumacher-Clean.fnt
-Font.11x2x1:
-Statusbar: on
-Foreground Color: 000000
-Background Color: B6C6E5
-backdrop:
-iconset:
-viewers iconset:
-selector type: bar (inverse)
-</wps>
-
-<wps>
 Name: boxes.wps
 rwps: boxes.rwps
 SBS: