diff --git a/CHANGES.WII b/CHANGES.WII
new file mode 100644
index 0000000..3407cd9
--- /dev/null
+++ b/CHANGES.WII
@@ -0,0 +1,68 @@
+version 4:
+		* Make menu delay a bit shorter (looks better with the classic controller)
+
+		* Merged with the Frodo CVS trunk. This changes a number of things, most
+		  visibly the palette
+
+        -- Simon Kagstrom <simon.kagstrom@gmail.com>,
+
+version 3:
+        * Various cleanup of the code
+
+        * Fixed a bug in the menu code which was triggered when there
+          is more than one submenu
+
+        * Make speed configurable (basically fast/normal/slow) and
+          change the menus a bit
+
+        * Skip SDL_Delay and SDL_GetTicks() which seem to give strange
+          results. Use gettime and usleep instead.
+
+        * Improve performance a bit more by doing a custom
+          blit-to-double-size implementation
+
+        * Fixed changelog format
+
+        * Bought a Classic controller and fixed so that it actually works...
+
+        * Allow controlling the joystick via the keyboard for the host (basically
+          to ease debugging)
+
+        -- Simon Kagstrom <simon.kagstrom@gmail.com>, Sun Jan 11 19:46:01 CET 2009
+
+version 2:
+        * Also support the .prg and p00, s00 formats. Only .prg has been tested.
+
+        * Added support for classic controllers. NOTE: This is untested since I don't
+          have a classic controller!
+
+        * Fixed some corner-cases in the prefs setting to avoid loosing key bindings etc
+
+        * Improve keyboard bindings to handle press and release correctly and also
+          both controllers at the same time (key is released when the last controller releases
+          it)
+
+        * Handle keycode 0 and therefore make del work
+
+        * Remove the 1-1 graphics option and make stretched the default. Should avoid
+          "helpful and constructive" messages such as
+             http://wiinewz.com/forums/nintendo-news/91829-frodo-v1-0-a.html#post580580
+
+        * Improved speed just a bit (by enabling compiler optimization!)
+
+        * Only save prefs on exit
+
+        * Pause sound in the menu
+
+        * Handle very long filenames better (thanks Corey89 for pointing this out)
+
+        * Corrected file sorting
+
+        * Better Makefile
+
+        * More keycodes added (C= etc)
+
+        -- Simon Kagstrom <simon.kagstrom@gmail.com>, Sat Jan 10 17:26:32 CET 2009
+
+version 1:
+        * Initial release
diff --git a/Src/menu.cpp b/Src/menu.cpp
index abc5041..8e480f3 100644
--- a/Src/menu.cpp
+++ b/Src/menu.cpp
@@ -357,7 +357,7 @@ static uint32_t wait_key_press(void)
 		}
 		if (keys != 0)
 			return keys;
-		SDL_Delay(100);
+		SDL_Delay(30);
 	}
 
 	return keys;
diff --git a/meta.xml b/meta.xml
new file mode 100644
index 0000000..a4a46b3
--- /dev/null
+++ b/meta.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+  <app version="4">
+    <name>Frodo</name>
+    <coder>Simon Kagstrom</coder>
+    <version>4</version>
+    <release_date>20090111</release_date>
+    <short_description>Commodore 64 emulator</short_description>
+    <long_description>Frodo is a C64 emulator written by Christian Bauer. It supports C64 disk and tape images in the .d64, .t64 and .prg formats. The port to Wii was done by Simon Kagstrom.</long_description>
+  </app>