diff --git a/rbutil/archos.ico b/rbutil/archos.ico
new file mode 100644
index 0000000000..6c2171337e
Binary files /dev/null and b/rbutil/archos.ico differ
diff --git a/rbutil/copying.txt b/rbutil/copying.txt
index 8957c246ca..d57cce3cfb 100644
--- a/rbutil/copying.txt
+++ b/rbutil/copying.txt
@@ -367,4 +367,4 @@ This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
\ No newline at end of file
+Public License instead of this License.
diff --git a/rbutil/rbutil.cbp b/rbutil/rbutil.cbp
index 9c4e6de22e..ae6fc4a15a 100644
--- a/rbutil/rbutil.cbp
+++ b/rbutil/rbutil.cbp
@@ -76,6 +76,7 @@
 			<Option compilerVar="CPP" />
 			<Option compile="0" />
 			<Option link="0" />
+			<Option target="default" />
 		</Unit>
 		<Unit filename="fonts_3d.xpm">
 			<Option compilerVar="CPP" />
@@ -104,12 +105,6 @@
 			<Option compilerVar="CPP" />
 			<Option target="default" />
 		</Unit>
-		<Unit filename="rbutil.exe.Manifest">
-			<Option compilerVar="CPP" />
-			<Option compile="0" />
-			<Option link="0" />
-			<Option target="default" />
-		</Unit>
 		<Unit filename="rbutil.h">
 			<Option compilerVar="CPP" />
 			<Option compile="0" />
@@ -154,6 +149,12 @@
 			<Option link="0" />
 			<Option target="default" />
 		</Unit>
+		<Unit filename="tools2_3d.xpm">
+			<Option compilerVar="CPP" />
+			<Option compile="0" />
+			<Option link="0" />
+			<Option target="default" />
+		</Unit>
 		<Unit filename="uninstall_3d.xpm">
 			<Option compilerVar="CPP" />
 			<Option compile="0" />
@@ -176,6 +177,12 @@
 			<Option link="0" />
 			<Option target="default" />
 		</Unit>
+		<Unit filename="wx_pch.h">
+			<Option compilerVar="CPP" />
+			<Option compile="0" />
+			<Option link="0" />
+			<Option target="default" />
+		</Unit>
 		<Extensions />
 	</Project>
 </CodeBlocks_project_file>
\ No newline at end of file
diff --git a/rbutil/rbutil.cpp b/rbutil/rbutil.cpp
index 8abd362a81..7591408022 100644
--- a/rbutil/rbutil.cpp
+++ b/rbutil/rbutil.cpp
@@ -36,7 +36,10 @@ wxDEFINE_SCOPED_PTR_TYPE(wxZipEntry);
 const wxChar* _rootmatch[] = {
     wxT("rockbox.*"),
     wxT("ajbrec.ajz"),
-    wxT("archos.mod")
+    wxT("archos.mod"),
+    wxT(".scrobbler.*"),
+    wxT("battery_bench.txt"),
+    wxT("battery.dummy"),
 };
 const wxArrayString* rootmatch = new wxArrayString(
     (size_t) (sizeof(_rootmatch) / sizeof(wxChar*)), _rootmatch);
diff --git a/rbutil/rbutilApp.h b/rbutil/rbutilApp.h
index 18b3e0c737..bac6dc2c32 100644
--- a/rbutil/rbutilApp.h
+++ b/rbutil/rbutilApp.h
@@ -38,4 +38,4 @@ public:
 
 };
 
- 
+
diff --git a/rbutil/wizard_pages.h b/rbutil/wizard_pages.h
index 982ff1e65e..6fa6b88034 100644
--- a/rbutil/wizard_pages.h
+++ b/rbutil/wizard_pages.h
@@ -8,7 +8,7 @@ class wxPlatformPage : public wxWizardPageSimple
 public:
     wxPlatformPage(wxWizard *parent);
     virtual bool TransferDataFromWindow(void);
-    
+
 public:
     wxListBox* PlatformListBox;
 };
@@ -17,17 +17,17 @@ class wxLocationPage : public wxWizardPageSimple
 {
 private:
     DECLARE_EVENT_TABLE()
-    
+
 public:
     enum {
          ID_LOCATION_BTN      = 1000,
     };
-    
+
 public:
     wxLocationPage(wxWizard* parent);
     virtual bool TransferDataFromWindow(void);
    	void OnLocationBtn(wxCommandEvent& event);
-    
+
 public:
     wxStaticText* LocationText;
 };
@@ -47,7 +47,7 @@ public:
     virtual bool TransferDataFromWindow(void);
     void OnBuildBox(wxCommandEvent& event);
     void OnPageShown(wxWizardEvent& event);
-    
+
 public:
     wxRadioBox* BuildRadioBox;
     wxStaticText* DetailText;
@@ -59,7 +59,7 @@ class wxFullUninstallPage : public wxWizardPageSimple
 public:
     wxFullUninstallPage(wxWizard *parent);
     virtual bool TransferDataFromWindow(void);
-    
+
 public:
     wxCheckBox* FullCheckBox;
 };