diff --git a/project/jni/application/puae/AndroidAppSettings.cfg b/project/jni/application/puae/AndroidAppSettings.cfg
index aa225e9ee..396315120 100644
--- a/project/jni/application/puae/AndroidAppSettings.cfg
+++ b/project/jni/application/puae/AndroidAppSettings.cfg
@@ -4,8 +4,8 @@ LibSdlVersion=1.2
 AppName="PUAE"
 AppFullName=gnostic.puae.sdl
 ScreenOrientation=h
-InhibitSuspend=n
-AppDataDownloadUrl="Data|data.zip"
+InhibitSuspend=y
+AppDataDownloadUrl="!kickrom files|kickroms.zip^!Sysinfo|sysinfo.zip"
 VideoDepthBpp=16
 NeedDepthBuffer=n
 NeedStencilBuffer=n
@@ -14,28 +14,28 @@ SwVideoMode=y
 SdlVideoResize=y
 SdlVideoResizeKeepAspect=n
 CompatibilityHacks=n
-AppUsesMouse=n
-AppNeedsTwoButtonMouse=n
+AppUsesMouse=y
+AppNeedsTwoButtonMouse=y
 AppNeedsArrowKeys=y
 AppNeedsTextInput=y
 AppUsesJoystick=n
 AppHandlesJoystickSensitivity=y
 AppUsesMultitouch=n
 NonBlockingSwapBuffers=n
-RedefinedKeys="F6 RETURN F4 F3 F1 ESCAPE F6 F3 F4 F2 F6"
-AppTouchscreenKeyboardKeysAmount=6
+RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP LCTRL ESCAPE F6 F3 F4 F2 F6"
+AppTouchscreenKeyboardKeysAmount=4
 AppTouchscreenKeyboardKeysAmountAutoFire=2
-RedefinedKeysScreenKb="F6 F1 RETURN F4 F3 F2"
+RedefinedKeysScreenKb="SPACE RETURN F11 F12"
 StartupMenuButtonTimeout=3000
 HiddenMenuOptions='OptionalDownloadConfig'
 FirstStartMenuOptions=''
 MultiABI=n
 AppVersionCode=23301
 AppVersionName="2.3.3.01"
-CompiledLibraries="jpeg png freetype sdl_image"
-CustomBuildScript=n
-AppCflags='-DHAVE_CONFIG_H -D_GNU_SOURCE=1 -D_REENTRANT -DCPUEMU_0 -DCPUEMU_11 -DCPUEMU_12 -DCPUEMU_20 -DCPUEMU_21 -DCPUEMU_31 -DMMU -DFPUEMU -DAGA -DAUTOCONFIG -DFILESYS -DBSDSOCKET -DSUPPORT_THREADS -DUSE_SDL -DFDI2RAW -DDEBUGGER -DSAVESTATE -DENFORCER -DACTION_REPLAY -DXARCADE -DDRIVESOUND -DREGPARAM '
+CompiledLibraries="jpeg png"
+CustomBuildScript=y
+AppCflags=''
 AppLdflags=''
-AppSubdirsBuild='PUAE/src PUAE/src/include'
+AppSubdirsBuild=''
 AppCmdline=''
 ReadmeText='^You may press "Home" now - the data will be downloaded in background'
diff --git a/project/jni/application/puae/AndroidBuild.sh b/project/jni/application/puae/AndroidBuild.sh
index 30d9d3394..5d1ecddeb 100755
--- a/project/jni/application/puae/AndroidBuild.sh
+++ b/project/jni/application/puae/AndroidBuild.sh
@@ -5,14 +5,13 @@ LOCAL_PATH=`dirname $0`
 LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 
 ln -sf libsdl-1.2.so $LOCAL_PATH/../../../obj/local/armeabi/libSDL.so
-ln -sf libsdl-1.2.so $LOCAL_PATH/../../../obj/local/armeabi/libpthread.so
 
 if [ \! -f PUAE/configure ] ; then
 	sh -c "cd PUAE && ./bootstrap.sh"
 fi
 
 if [ \! -f PUAE/Makefile ] ; then
-	../setEnvironment.sh sh -c "cd PUAE && env SDL_CONFIG=$LOCAL_PATH/../sdl-config ./configure --build=x86_64-unknown-linux-gnu --host=arm-linux-androideabi --with-sdl --with-sdl-sound --with-sdl-gfx --with-sdl-gui --disable-gtktest"
+	../setEnvironment.sh sh -c "cd PUAE && ./configure --build=x86_64-unknown-linux-gnu --host=arm-linux-androideabi --with-sdl --with-sdl-sound --with-sdl-gfx --with-sdl-gui"
 fi
 
-make -C PUAE -j4 && mv -f PUAE/puae libapplication.so
+make -C PUAE && mv -f PUAE/src/uae libapplication.so
diff --git a/project/jni/application/puae/AndroidData/data.zip b/project/jni/application/puae/AndroidData/data.zip
deleted file mode 100644
index eecc7bb46..000000000
Binary files a/project/jni/application/puae/AndroidData/data.zip and /dev/null differ
diff --git a/project/jni/application/puae/AndroidData/kickroms.zip b/project/jni/application/puae/AndroidData/kickroms.zip
new file mode 100644
index 000000000..ac35358b5
Binary files /dev/null and b/project/jni/application/puae/AndroidData/kickroms.zip differ
diff --git a/project/jni/application/puae/AndroidData/sysinfo.zip b/project/jni/application/puae/AndroidData/sysinfo.zip
new file mode 100644
index 000000000..0ae376698
Binary files /dev/null and b/project/jni/application/puae/AndroidData/sysinfo.zip differ
diff --git a/project/jni/application/puae/readme.txt b/project/jni/application/puae/readme.txt
index 04d0cbb92..5b91a507f 100644
--- a/project/jni/application/puae/readme.txt
+++ b/project/jni/application/puae/readme.txt
@@ -1,4 +1,5 @@
 Grab PUAE sources:
 git clone git://github.com/GnoStiC/PUAE.git
 Apply patch puae.diff, then you may run build.sh
-Warning: it won't build yet, you'll need to edit makefiles by hand
\ No newline at end of file
+Also you should deinstall libgtk2.0-dev from your Linux,
+otherwise it will be detected by configure script and will break compilation.