diff --git a/Makefile b/Makefile
index 99c09369..9a9c9f16 100644
--- a/Makefile
+++ b/Makefile
@@ -185,29 +185,3 @@ cpu/sh2/mame/sh2pico.o : cpu/sh2/mame/sh2.c
 pico/pico.o pico/cd/mcd.o pico/32x/32x.o : pico/pico_cmn.c pico/pico_int.h
 pico/memory.o pico/cd/memory.o : pico/pico_int.h pico/memory.h
 cpu/fame/famec.o: cpu/fame/famec.c cpu/fame/famec_opcodes.h
-
-# ----------- release -----------
-
-VER ?= $(shell head -n 1 platform/common/version.h | \
-	sed 's/.*"\(.*\)\.\(.*\)".*/\1\2/g')
-
-ifeq "$(PLATFORM)" "pandora"
-
-PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
-
-/tmp/readme.txt: tools/textfilter platform/base_readme.txt
-	tools/textfilter platform/base_readme.txt $@ PANDORA
-
-/tmp/PicoDrive.pxml: platform/pandora/PicoDrive.pxml.template
-	platform/pandora/make_pxml.sh $^ $@
-
-rel: PicoDrive platform/pandora/PicoDrive.run platform/pandora/picorestore \
-	pico/carthw.cfg /tmp/readme.txt platform/pandora/skin \
-	platform/pandora/PicoDrive.png platform/pandora/PicoDrive_p.png \
-	/tmp/PicoDrive.pxml
-	rm -rf out
-	mkdir out
-	cp -r $^ out/
-	$(PND_MAKE) -p PicoDrive_$(VER).pnd -d out -x out/PicoDrive.pxml -i out/PicoDrive.png -c
-
-endif
diff --git a/platform/base_readme.txt b/platform/base_readme.txt
index 035ff4a5..0b2748e6 100644
--- a/platform/base_readme.txt
+++ b/platform/base_readme.txt
@@ -562,9 +562,19 @@ Additional thanks
 
 Changelog
 ---------
-1.85
+1.85 (2013-08-31)
+  * Lots of 32X compatibility and accuracy improvements. All commercial games
+    are booting now, but some still have issues.
+  * Fixed some regressions in MegaCD code, like hang in jap BIOS.
+  * Implemented pause for SMS.
+  * Updated UI with improvements from PCSX ReARMed.
+  * Frontend timing has been rewritten, should no longer slowly desync from
+    LCD on pandora.
+  * Added libretro and SDL 32/64bit ports, fixed compatibility issues with
+    Android, iOS.
+  * Various other things I forgot (it has been a while since last release..)
 
-1.80
+1.80 (2010-09-19)
   + Added Caanoo support. Now the GP2X binary supports GP2X F100/F200, Wiz
     and Caanoo. Lots of internal refactoring to support this.
   + Enabled 32X and SMS code. It's still unfinished but better release something
@@ -581,7 +591,7 @@ Changelog
 1.80beta2
   * Pandora: updated documentation.
 
-1.80beta1
+1.80beta1 (2010-06-02)
   + Added pandora port.
   * Internal refactoring for 32x/SMS support.
   * Move mapper database to external file.
@@ -590,7 +600,7 @@ Changelog
   + ARM: Added new SH2 recompiler for 32x. Some unification with SVP one.
   - Disabled most of the above bacause I'm not yet happy with the results.
 
-1.56
+1.56 (2009-09-19)
   * Changed sync in Sega CD emulation again. Should fix games that
     broke after changes in 1.51a.
   * Fixed default keys rebinding when they shouldn't.
@@ -835,7 +845,7 @@ Changelog
   + GP2X: Added experimental Sega CD support.
   + GP2X: Added partial gmv movie playback support.
 
-0.964
+0.964 (2006-12-03)
   * GP2X: Fixed a sound buffer underflow issue on lower sample rate modes, which was
           happening for NTSC games and causing sound clicks.
   * GP2X: Redone key config to better support USB joysticks (now multiple joysticks
@@ -1016,7 +1026,7 @@ Changelog
     not from hardcoded paths.
   * Improved 'pause on call' feature, should hopefully work with Motorola phones.
 
-0.30
+0.30 (2006-01-07)
   Initial release.
 
 
diff --git a/platform/common/config_file.c b/platform/common/config_file.c
index f8f7fdf1..324c993e 100644
--- a/platform/common/config_file.c
+++ b/platform/common/config_file.c
@@ -323,6 +323,10 @@ static int custom_read(menu_entry *me, const char *var, const char *val)
 			Pico32xSetClocks(0, currentConfig.ssh2_khz * 1000);
 			return 1;
 
+		case MA_OPT2_GAMMA:
+			currentConfig.gamma = atoi(val);
+			return 1;
+
 		/* PSP */
 		case MA_OPT3_SCALE:
 			if (strcasecmp(var, "Scale factor") != 0) return 0;
diff --git a/platform/common/emu.c b/platform/common/emu.c
index c403dfa3..1024b84b 100644
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -348,6 +348,8 @@ static void do_region_override(const char *media_fname)
 
 int emu_reload_rom(const char *rom_fname_in)
 {
+	// use setting before rom config is loaded
+	int autoload = g_autostateld_opt;
 	char *rom_fname = NULL;
 	char ext[5];
 	enum media_type_e media_type;
@@ -491,7 +493,7 @@ int emu_reload_rom(const char *rom_fname_in)
 		emu_save_load_game(1, 1);
 
 	// state autoload?
-	if (g_autostateld_opt) {
+	if (autoload) {
 		int time, newest = 0, newest_slot = -1;
 		int slot;
 
diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c
index 57a339aa..0a5e85ae 100644
--- a/platform/common/menu_pico.c
+++ b/platform/common/menu_pico.c
@@ -743,7 +743,7 @@ static menu_entry e_menu_options[] =
 	mee_onoff     ("Enable sound",             MA_OPT_ENABLE_SOUND,  currentConfig.EmuOpt, EOPT_EN_SOUND),
 	mee_cust      ("Sound Quality",            MA_OPT_SOUND_QUALITY, mh_opt_misc, mgn_opt_sound),
 	mee_enum_h    ("Confirm savestate",        MA_OPT_CONFIRM_STATES,currentConfig.confirm_save, men_confirm_save, h_confirm_save),
-	mee_range     ("",                         MA_OPT_CPU_CLOCKS,    currentConfig.CPUclock, 20, 1200),
+	mee_range     ("",                         MA_OPT_CPU_CLOCKS,    currentConfig.CPUclock, 20, 3200),
 	mee_handler   ("[Display options]",        menu_loop_gfx_options),
 	mee_handler   ("[Sega/Mega CD options]",   menu_loop_cd_options),
 #ifndef NO_32X
diff --git a/platform/common/version.h b/platform/common/version.h
index e2cecb02..14a4f823 100644
--- a/platform/common/version.h
+++ b/platform/common/version.h
@@ -1,2 +1 @@
-#define VERSION "1.81"
-
+#define VERSION "1.85"
diff --git a/platform/pandora/Makefile b/platform/pandora/Makefile
new file mode 100644
index 00000000..c7e7c00c
--- /dev/null
+++ b/platform/pandora/Makefile
@@ -0,0 +1,27 @@
+# release packaging makefile
+
+VER ?= $(shell head -n 1 ../common/version.h | \
+	sed 's/.*"\(.*\)\.\(.*\)".*/\1\2/g')
+
+PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
+
+all: rel
+
+../../tools/textfilter:
+	make -C ../../tools/
+
+/tmp/readme.txt: ../../tools/textfilter ../base_readme.txt
+	../../tools/textfilter ../base_readme.txt $@ PANDORA
+
+/tmp/PicoDrive.pxml: PicoDrive.pxml.template
+	./make_pxml.sh $^ $@
+
+rel: ../../PicoDrive PicoDrive.sh picorestore \
+	PicoDrive.png PicoDrive_p.png \
+	../../pico/carthw.cfg skin \
+	/tmp/readme.txt /tmp/PicoDrive.pxml
+	rm -rf out
+	mkdir out
+	cp -r $^ out/
+	$(PND_MAKE) -p PicoDrive_$(VER).pnd -d out -x out/PicoDrive.pxml -i out/PicoDrive.png -c
+
diff --git a/platform/pandora/PicoDrive.pxml.template b/platform/pandora/PicoDrive.pxml.template
index b65a1d3d..220d48ea 100644
--- a/platform/pandora/PicoDrive.pxml.template
+++ b/platform/pandora/PicoDrive.pxml.template
@@ -4,10 +4,10 @@
   <titles>
     <title lang="en_US">PicoDrive</title>
   </titles>
-  <version major="1" minor="80" release="0" build="899"/>
+  <version major="@major@" minor="@minor@" release="0" build="@build@"/>
   <author name="notaz" website="http://notaz.gp2x.de/"/>
 </package>
-<application id="picodrive.notaz.@major@.@minor@">
+<application id="picodrive.notaz.@major@.@minor@" appdata="picodrive">
   <titles>
     <title lang="en_US">PicoDrive @major@.@minor@</title>
   </titles>
@@ -18,7 +18,7 @@
     <description lang="de_DE">Ein MegaDrive/SegaCD/32x Emulator</description>
   </descriptions>
  
-  <exec command="PicoDrive.run"/>
+  <exec command="PicoDrive.sh"/>
  
   <previewpics>
    <pic src="PicoDrive_p.png"/>
@@ -32,7 +32,7 @@
     <license name="other"/>
   </licenses>
  
-  <version major="@major@" minor="@minor@" release="0" build="@revision@"/>
+  <version major="@major@" minor="@minor@" release="0" build="@build@"/>
   <info name="PicoDrive @major@.@minor@ readme" type="text/plain" src="readme.txt"/>
  
   <categories>
diff --git a/platform/pandora/PicoDrive.run b/platform/pandora/PicoDrive.run
deleted file mode 100755
index dc7c04d6..00000000
--- a/platform/pandora/PicoDrive.run
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-./PicoDrive "$@"
-
-# restore stuff if pico crashes
-./picorestore
diff --git a/platform/pandora/PicoDrive.sh b/platform/pandora/PicoDrive.sh
new file mode 100755
index 00000000..02943e76
--- /dev/null
+++ b/platform/pandora/PicoDrive.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# 2x2M hugepages should be enough
+sudo -n /usr/pandora/scripts/op_hugetlb.sh 4
+
+./PicoDrive "$@"
+
+# restore stuff if pico crashes
+./picorestore
+sudo -n /usr/pandora/scripts/op_lcdrate.sh 60
+sudo -n /usr/pandora/scripts/op_gamma.sh 0
+sudo -n /usr/pandora/scripts/op_hugetlb.sh 0
diff --git a/platform/pandora/make_pxml.sh b/platform/pandora/make_pxml.sh
index 875c7914..2267c14a 100755
--- a/platform/pandora/make_pxml.sh
+++ b/platform/pandora/make_pxml.sh
@@ -1,10 +1,17 @@
 #!/bin/sh
-sed -i
+set -e
 
-major=`head -n 1 version.h | sed 's/.*"\([0-9]*\)\.\([0-9]*\).*/\1/g'`
-minor=`head -n 1 version.h | sed 's/.*"\([0-9]*\)\.\([0-9]*\).*/\2/g'`
-revision=`head -n 1 revision.h | sed 's/.*"\([0-9]*\)".*/\1/g'`
+verfile=../common/version.h
+test -f $verfile
+
+major=`head -n 1 $verfile | sed 's/.*"\([0-9]*\)\.\([0-9]*\).*/\1/g'`
+minor=`head -n 1 $verfile | sed 's/.*"\([0-9]*\)\.\([0-9]*\).*/\2/g'`
+# lame, I know..
+build=`git describe HEAD | grep -- - | sed -e 's/.*\-\(.*\)\-.*/\1/'`
+test -n "$build" || build=0
+
+trap "rm -f $2" ERR
 
 sed 's/@major@/'$major'/' "$1" > "$2"
 sed -i 's/@minor@/'$minor'/' "$2"
-sed -i 's/@revision@/'$revision'/' "$2"
+sed -i 's/@build@/'$build'/' "$2"