Index: openttd-1.0.2/src/toolbar_gui.cpp
===================================================================
--- openttd-1.0.2.orig/src/toolbar_gui.cpp	2010-03-16 21:54:26.000000000 +0100
+++ openttd-1.0.2/src/toolbar_gui.cpp	2010-06-28 22:59:57.000000000 +0200
@@ -1525,6 +1525,12 @@
 const uint16 _maintoolbar_smallmap_keys[] = {WKC_F4, 'M', 0};
 
 Hotkey<MainToolbarWindow> MainToolbarWindow::maintoolbar_hotkeys[] = {
+#ifdef MAEMO
+	Hotkey<MainToolbarWindow>(WKC_F5, "pause", MTHK_PAUSE),
+	Hotkey<MainToolbarWindow>(WKC_F7, "zoomin", MTEHK_ZOOM_IN),
+	Hotkey<MainToolbarWindow>(WKC_F8, "zoomout", MTEHK_ZOOM_OUT),
+	Hotkey<MainToolbarWindow>(WKC_ESC, "exit", SLNME_EXIT_TOINTRO),
+#else
 	Hotkey<MainToolbarWindow>(_maintoolbar_pause_keys, "pause", MTHK_PAUSE),
 	Hotkey<MainToolbarWindow>((uint16)0, "fastforward", MTHK_FASTFORWARD),
 	Hotkey<MainToolbarWindow>(WKC_F2, "settings", MTHK_SETTINGS),
@@ -1562,6 +1568,7 @@
 	Hotkey<MainToolbarWindow>((uint16)0, "client_list", MTHK_CLIENT_LIST),
 #endif
 	Hotkey<MainToolbarWindow>((uint16)0, "sign_list", MTHK_SIGN_LIST),
+#endif
 	HOTKEY_LIST_END(MainToolbarWindow)
 };
 Hotkey<MainToolbarWindow> *_maintoolbar_hotkeys = MainToolbarWindow::maintoolbar_hotkeys;
Index: openttd-1.0.2/src/intro_gui.cpp
===================================================================
--- openttd-1.0.2.orig/src/intro_gui.cpp	2010-02-10 21:20:18.000000000 +0100
+++ openttd-1.0.2/src/intro_gui.cpp	2010-06-28 22:59:57.000000000 +0200
@@ -149,6 +149,18 @@
 			case SGI_EXIT:            HandleExitGameRequest(); break;
 		}
 	}
+
+#ifdef MAEMO
+	virtual EventState OnKeyPress(uint16 key, uint16 keycode)
+	{
+		switch (keycode) {
+			case WKC_ESC: /* ESC closes the window */
+				HandleExitGameRequest();
+				return ES_HANDLED;
+		}
+		return ES_NOT_HANDLED;
+	}
+#endif
 };
 
 static const NWidgetPart _nested_select_game_widgets[] = {
Index: openttd-1.0.2/src/video/sdl_v.cpp
===================================================================
--- openttd-1.0.2.orig/src/video/sdl_v.cpp	2010-06-28 22:59:53.000000000 +0200
+++ openttd-1.0.2/src/video/sdl_v.cpp	2010-06-28 22:59:57.000000000 +0200
@@ -568,6 +568,19 @@
 			break;
 
 		case SDL_KEYDOWN: // Toggle full-screen on ALT + ENTER/F
+#ifdef MAEMO
+			/* On Maemo, toggle fullscreen on F6 too. */
+			if (ev.key.keysym.sym == SDLK_F6) {
+				ToggleFullScreen(!_fullscreen);
+				break;
+			}
+			/* On Maemo, toggle fullscreen on Ctrl+Return too. */
+			if ((ev.key.keysym.mod & KMOD_CTRL) &&
+					(ev.key.keysym.sym == SDLK_KP_ENTER)) {
+				ToggleFullScreen(!_fullscreen);
+				break;
+			}
+#endif
 			if ((ev.key.keysym.mod & (KMOD_ALT | KMOD_META)) &&
 					(ev.key.keysym.sym == SDLK_RETURN || ev.key.keysym.sym == SDLK_f)) {
 				ToggleFullScreen(!_fullscreen);
