diff --git a/project/java/Settings.java b/project/java/Settings.java
index 1d5b84919..0b1f25bfd 100644
--- a/project/java/Settings.java
+++ b/project/java/Settings.java
@@ -55,6 +55,9 @@ import android.graphics.Bitmap;
 import android.widget.TextView;
 import android.widget.EditText;
 import android.widget.ScrollView;
+import android.widget.Button;
+import android.view.View;
+import android.widget.LinearLayout;
 import android.text.Editable;
 import android.text.SpannedString;
 import android.content.Intent;
@@ -2395,7 +2398,7 @@ class Settings
 			for( String r: readmes )
 			{
 				if( r.startsWith(lang) )
-					readme = r;
+					readme = r.substring(lang.length());
 			}
 			TextView text = new TextView(p);
 			text.setMaxLines(1000);
@@ -2404,7 +2407,21 @@ class Settings
 			AlertDialog.Builder builder = new AlertDialog.Builder(p);
 			ScrollView scroll = new ScrollView(p);
 			scroll.addView(text);
-			builder.setView(scroll);
+			Button ok = new Button(p);
+			final AlertDialog alertDismiss[] = new AlertDialog[1];
+			ok.setOnClickListener(new View.OnClickListener()
+			{
+				public void onClick(View v)
+				{
+					alertDismiss[0].cancel();
+				}
+			});
+			ok.setText(R.string.ok);
+			LinearLayout layout = new LinearLayout(p);
+			layout.setOrientation(LinearLayout.VERTICAL);
+			layout.addView(scroll);
+			layout.addView(ok);
+			builder.setView(layout);
 			builder.setOnCancelListener(new DialogInterface.OnCancelListener()
 			{
 				public void onCancel(DialogInterface dialog)
@@ -2413,6 +2430,7 @@ class Settings
 				}
 			});
 			AlertDialog alert = builder.create();
+			alertDismiss[0] = alert;
 			alert.setOwnerActivity(p);
 			alert.show();
 		}
diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius
index a7be774b3..765291c85 160000
--- a/project/jni/application/commandergenius/commandergenius
+++ b/project/jni/application/commandergenius/commandergenius
@@ -1 +1 @@
-Subproject commit a7be774b3ebf0ab9b166e40b7a12d2392590d938
+Subproject commit 765291c858ca6f93a1ddb47718a1e024e346c70e
diff --git a/project/jni/application/dosbox/dosbox-0.74-androidSDL.diff b/project/jni/application/dosbox/dosbox-0.74-androidSDL.diff
index a53592750..c647a6978 100644
--- a/project/jni/application/dosbox/dosbox-0.74-androidSDL.diff
+++ b/project/jni/application/dosbox/dosbox-0.74-androidSDL.diff
@@ -1,6 +1,6 @@
-diff -u -r old/dosbox-0.74/config.sub dosbox-0.74/config.sub
+diff -r -u old/dosbox-0.74/config.sub dosbox-0.74/config.sub
 --- old/dosbox-0.74/config.sub	2010-05-10 20:43:54.000000000 +0300
-+++ dosbox-0.74/config.sub	2012-11-21 20:07:56.792101410 +0200
++++ dosbox-0.74/config.sub	2012-11-21 21:14:48.428064682 +0200
 @@ -1298,7 +1298,7 @@
  	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
  	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
@@ -10,9 +10,9 @@ diff -u -r old/dosbox-0.74/config.sub dosbox-0.74/config.sub
  	      | -chorusos* | -chorusrdb* | -cegcc* \
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-diff -u -r old/dosbox-0.74/src/dos/drive_local.cpp dosbox-0.74/src/dos/drive_local.cpp
+diff -r -u old/dosbox-0.74/src/dos/drive_local.cpp dosbox-0.74/src/dos/drive_local.cpp
 --- old/dosbox-0.74/src/dos/drive_local.cpp	2010-05-10 20:43:54.000000000 +0300
-+++ dosbox-0.74/src/dos/drive_local.cpp	2012-11-21 20:07:56.792101410 +0200
++++ dosbox-0.74/src/dos/drive_local.cpp	2012-11-21 21:14:48.428064682 +0200
 @@ -273,7 +273,7 @@
  
  	find_size=(Bit32u) stat_block.st_size;
@@ -40,9 +40,9 @@ diff -u -r old/dosbox-0.74/src/dos/drive_local.cpp dosbox-0.74/src/dos/drive_loc
  		time=DOS_PackTime((Bit16u)ltime->tm_hour,(Bit16u)ltime->tm_min,(Bit16u)ltime->tm_sec);
  		date=DOS_PackDate((Bit16u)(ltime->tm_year+1900),(Bit16u)(ltime->tm_mon+1),(Bit16u)ltime->tm_mday);
  	} else {
-diff -u -r old/dosbox-0.74/src/gui/sdlmain.cpp dosbox-0.74/src/gui/sdlmain.cpp
+diff -r -u old/dosbox-0.74/src/gui/sdlmain.cpp dosbox-0.74/src/gui/sdlmain.cpp
 --- old/dosbox-0.74/src/gui/sdlmain.cpp	2010-05-10 20:43:54.000000000 +0300
-+++ dosbox-0.74/src/gui/sdlmain.cpp	2012-11-21 20:15:34.276097221 +0200
++++ dosbox-0.74/src/gui/sdlmain.cpp	2012-11-21 21:51:37.128044459 +0200
 @@ -32,6 +32,7 @@
  #include <signal.h>
  #include <process.h>
@@ -51,6 +51,15 @@ diff -u -r old/dosbox-0.74/src/gui/sdlmain.cpp dosbox-0.74/src/gui/sdlmain.cpp
  
  #include "cross.h"
  #include "SDL.h"
+@@ -755,7 +756,7 @@
+ 	sdl.updating=false;
+ 	switch (sdl.desktop.type) {
+ 	case SCREEN_SURFACE:
+-		if (SDL_MUSTLOCK(sdl.surface)) {
++		if (SDL_MUSTLOCK(sdl.surface) || true) {
+ 			if (sdl.blit.surface) {
+ 				SDL_UnlockSurface(sdl.blit.surface);
+ 				int Blit = SDL_BlitSurface( sdl.blit.surface, 0, sdl.surface, &sdl.clip );
 @@ -1453,6 +1454,7 @@
          strcat(buf,"\n");
  	va_end(msg);
diff --git a/project/jni/application/prefclub/dosbox-0.74-androidSDL.diff b/project/jni/application/prefclub/dosbox-0.74-androidSDL.diff
index a53592750..c647a6978 100644
--- a/project/jni/application/prefclub/dosbox-0.74-androidSDL.diff
+++ b/project/jni/application/prefclub/dosbox-0.74-androidSDL.diff
@@ -1,6 +1,6 @@
-diff -u -r old/dosbox-0.74/config.sub dosbox-0.74/config.sub
+diff -r -u old/dosbox-0.74/config.sub dosbox-0.74/config.sub
 --- old/dosbox-0.74/config.sub	2010-05-10 20:43:54.000000000 +0300
-+++ dosbox-0.74/config.sub	2012-11-21 20:07:56.792101410 +0200
++++ dosbox-0.74/config.sub	2012-11-21 21:14:48.428064682 +0200
 @@ -1298,7 +1298,7 @@
  	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
  	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
@@ -10,9 +10,9 @@ diff -u -r old/dosbox-0.74/config.sub dosbox-0.74/config.sub
  	      | -chorusos* | -chorusrdb* | -cegcc* \
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-diff -u -r old/dosbox-0.74/src/dos/drive_local.cpp dosbox-0.74/src/dos/drive_local.cpp
+diff -r -u old/dosbox-0.74/src/dos/drive_local.cpp dosbox-0.74/src/dos/drive_local.cpp
 --- old/dosbox-0.74/src/dos/drive_local.cpp	2010-05-10 20:43:54.000000000 +0300
-+++ dosbox-0.74/src/dos/drive_local.cpp	2012-11-21 20:07:56.792101410 +0200
++++ dosbox-0.74/src/dos/drive_local.cpp	2012-11-21 21:14:48.428064682 +0200
 @@ -273,7 +273,7 @@
  
  	find_size=(Bit32u) stat_block.st_size;
@@ -40,9 +40,9 @@ diff -u -r old/dosbox-0.74/src/dos/drive_local.cpp dosbox-0.74/src/dos/drive_loc
  		time=DOS_PackTime((Bit16u)ltime->tm_hour,(Bit16u)ltime->tm_min,(Bit16u)ltime->tm_sec);
  		date=DOS_PackDate((Bit16u)(ltime->tm_year+1900),(Bit16u)(ltime->tm_mon+1),(Bit16u)ltime->tm_mday);
  	} else {
-diff -u -r old/dosbox-0.74/src/gui/sdlmain.cpp dosbox-0.74/src/gui/sdlmain.cpp
+diff -r -u old/dosbox-0.74/src/gui/sdlmain.cpp dosbox-0.74/src/gui/sdlmain.cpp
 --- old/dosbox-0.74/src/gui/sdlmain.cpp	2010-05-10 20:43:54.000000000 +0300
-+++ dosbox-0.74/src/gui/sdlmain.cpp	2012-11-21 20:15:34.276097221 +0200
++++ dosbox-0.74/src/gui/sdlmain.cpp	2012-11-21 21:51:37.128044459 +0200
 @@ -32,6 +32,7 @@
  #include <signal.h>
  #include <process.h>
@@ -51,6 +51,15 @@ diff -u -r old/dosbox-0.74/src/gui/sdlmain.cpp dosbox-0.74/src/gui/sdlmain.cpp
  
  #include "cross.h"
  #include "SDL.h"
+@@ -755,7 +756,7 @@
+ 	sdl.updating=false;
+ 	switch (sdl.desktop.type) {
+ 	case SCREEN_SURFACE:
+-		if (SDL_MUSTLOCK(sdl.surface)) {
++		if (SDL_MUSTLOCK(sdl.surface) || true) {
+ 			if (sdl.blit.surface) {
+ 				SDL_UnlockSurface(sdl.blit.surface);
+ 				int Blit = SDL_BlitSurface( sdl.blit.surface, 0, sdl.surface, &sdl.clip );
 @@ -1453,6 +1454,7 @@
          strcat(buf,"\n");
  	va_end(msg);