diff --git a/stella/Makefile b/stella/Makefile
index 2d5055817..cb80d3ec0 100644
--- a/stella/Makefile
+++ b/stella/Makefile
@@ -13,7 +13,7 @@
 ## See the file "license" for information on usage and redistribution of
 ## this file, and for a DISCLAIMER OF ALL WARRANTIES.
 ##
-## $Id: Makefile,v 1.18 2006-02-01 13:53:25 stephena Exp $
+## $Id: Makefile,v 1.19 2006-02-15 03:12:12 azaballa Exp $
 ##
 ##   Based on code from ScummVM - Scumm Interpreter
 ##   Copyright (C) 2002-2004 The ScummVM project
@@ -242,6 +242,13 @@ psp-layout:
 
 # GP2X exec needs strip
 gp2x-strip: $(EXECUTABLE)
-	$(GP2X-STRIP) stella.gpe
+	$(GP2X-STRIP) stella
 
+# GP2X organize: groups necessary files into a gp2x folder for easy access.
+gp2x-organize:
+	mkdir -p "$(srcdir)/gp2x"
+	cp -v $(srcdir)/stella  $(srcdir)/gp2x
+	cp -v $(srcdir)/src/gp2x/stella.gpe $(srcdir)/gp2x
+	cp -v $(srcdir)/src/emucore/stella.pro $(srcdir)/gp2x
+	
 .PHONY: deb bundle test win32dist install uninstall
diff --git a/stella/README-GP2X.txt b/stella/README-GP2X.txt
index bb742f863..9b21b1483 100644
--- a/stella/README-GP2X.txt
+++ b/stella/README-GP2X.txt
@@ -1,13 +1,15 @@
 ---------------------------------------
 Stella 2.1 (revision 1):
 Ported to GP2X by Alex Zaballa
-Contact: alex.zaballa@gmail.com
+Contact: azaballa@users.sourceforge.net
 Homepage: http://stella.sourceforge.net
 ---------------------------------------
 
 --------
 Changes:
 --------
+>From 2.1-rv1
+Warlords graphics bug fixed
 >From 2.1
 Joystick fixed
 Phosphor effect enabled
@@ -22,8 +24,7 @@ Some button mapping (but still comfortably familiar)
 -----------
 Known Bugs:
 -----------
-2nd exit bug (yes, it's still there.... but, you can play many games before that second exit, lest we
-	forget save state. Fix coming soon.)
+Joy mouse skips menu items.
 
 ------------------------------
 Known GP2X Performance Issues:
@@ -33,7 +34,7 @@ Pitfall 2 runs slow due to extra hardware emulation. (Steve foresees this being
 ---------------------
 Installation to GP2X:
 ---------------------
-Place files stella.gpe and stella.pro into a chosen directory. Upon first run, Stella will ask for your
+Place files stella, stella.gpe, and stella.pro into a chosen directory. Upon first run, Stella will ask for your
 ROM directory and snapshot directory. Remember that the path to the sd card is '/mnt/sd'.
 
 -----------
@@ -75,8 +76,8 @@ export PATH=<your arm-linux compiler path>:$PATH
 
 This is what my configure line looks like:
 ./configure --prefix=<your destination folder> --enable-zlib --disable-developer --host=gp2x --with-zlib-prefix=<your
-gp2x zlib path> --with-png-prefix=<your gp2x png path> --with-sdl-prefix=<your sdl config path> --x-libraries=<your X11
-libraries path>
+gp2x zlib path> --with-png-prefix=<your gp2x png path (configure appends '/include')> --with-sdl-prefix=<your sdl config
+ path> --x-libraries=<your X11 libraries path>
 
 Then:
 make
@@ -86,7 +87,10 @@ make gp2x-strip
 
 You should get an exec ~2mb in size. Much better than 7mb right?
 
-Place stella.gpe and stella.pro (available in ../src/emucore) into your destination directory on the GP2X and run.
+To gather all necessary files into directory './stella/gp2x' for easy access, type:
+make gp2x-organize
+
+Note: /gp2x directory created in the main stella source directory (next to configure, Makefile, etc.).
 
 ---------------
 Special Thanks:
diff --git a/stella/configure b/stella/configure
index dafa058ce..e4d5305a8 100755
--- a/stella/configure
+++ b/stella/configure
@@ -416,7 +416,7 @@ psp)
 	EXEEXT=".elf"
 	;;
 gp2x)
-	EXEEXT=".gpe"
+	EXEEXT=""
 	;;
 *)
 	EXEEXT=""
@@ -839,9 +839,18 @@ case $_host_os in
 			CXXFLAGS="-O2 -finline-functions"
 			DEFINES="$DEFINES -DBSPF_GP2X -DGP2X -DHAVE_GETTIMEOFDAY -DHAVE_INTTYPES"
 			MODULES="$MODULES $SRC/gp2x"
-			INCLUDES="$INCLUDES -I$SRC/gp2x"
+
+			#If PNG_CFLAGS is specified, include it.
+			#This saves the user the step of having to specify CXXFLAGS beforehand.
+			if [ -n $PNG_CFLAGS  ]; then
+				INCLUDES="$INCLUDES $PNG_CFLAGS -I$SRC/gp2x"
+			else
+				INCLUDES="$INCLUDES -I$SRC/gp2x"
+			fi
+
 			_ranlib="arm-linux-ranlib"
 			_ar="arm-linux-ar cru"
+
 			# GP2X ARM Linux Specific strip
 			GP2X_STRIP="arm-linux-strip"
 			;;