diff --git a/COPYING.DOC b/COPYING
similarity index 96%
rename from COPYING.DOC
rename to COPYING
index f90922e..d159169 100644
--- a/COPYING.DOC
+++ b/COPYING
@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
-	    How to Apply These Terms to Your New Programs
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/Makefile b/Makefile
index 372756a..1deb6a2 100644
--- a/Makefile
+++ b/Makefile
@@ -5,24 +5,26 @@ FORCE_32BIT_ARCH=0
 HAVE_MMAP=0
 HAVE_MMAP_WIN32=0
 
+UNAME=$(shell uname -a)
+
 ifneq ($(EMSCRIPTEN),)
 	platform = emscripten
 endif
 
 ifeq ($(platform),)
 	platform = unix
-	ifeq ($(shell uname -a),)
+	ifeq ($(UNAME),)
 		platform = win
-	else ifneq ($(findstring MINGW,$(shell uname -a)),)
+	else ifneq ($(findstring MINGW,$(UNAME)),)
 		platform = win
-	else ifneq ($(findstring Darwin,$(shell uname -a)),)
+	else ifneq ($(findstring Darwin,$(UNAME)),)
 		platform = osx
 		arch = intel
 	ifeq ($(shell uname -p),powerpc)
 		arch = ppc
 		FORCE_32BIT_ARCH = 1
 	endif
-	else ifneq ($(findstring win,$(shell uname -a)),)
+	else ifneq ($(findstring win,$(UNAME)),)
 		platform = win
 	endif
 endif
@@ -46,16 +48,16 @@ endif
 
 # system platform
 system_platform = unix
-ifeq ($(shell uname -a),)
+ifeq ($(UNAME),)
 	EXE_EXT = .exe
 	system_platform = win
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
+else ifneq ($(findstring Darwin,$(UNAME)),)
 	system_platform = osx
 	arch = intel
 	ifeq ($(shell uname -p),powerpc)
 		arch = ppc
 	endif
-	else ifneq ($(findstring MINGW,$(shell uname -a)),)
+	else ifneq ($(findstring MINGW,$(UNAME)),)
 	system_platform = win
 endif
 
@@ -74,10 +76,10 @@ ifeq ($(platform), unix)
 	endif
 	CFLAGS += $(FORCE_32BIT)
 	LDFLAGS := -Wl,--no-undefined
+	ifeq ($(HAVE_DYNAREC),1)
+		HAVE_MMAP = 1
+	endif
 
-ifeq ($(HAVE_DYNAREC),1)
-	HAVE_MMAP = 1
-endif
 # OS X
 else ifeq ($(platform), osx)
 	TARGET := $(TARGET_NAME)_libretro.dylib
@@ -91,10 +93,9 @@ else ifeq ($(platform), osx)
 		fpic += -mmacosx-version-min=10.5
 	endif
 	SHARED := -dynamiclib
-
-ifeq ($(HAVE_DYNAREC),1)
-	HAVE_MMAP = 1
-endif
+	ifeq ($(HAVE_DYNAREC),1)
+		HAVE_MMAP = 1
+	endif
 
 # iOS
 else ifeq ($(platform), ios)
@@ -186,7 +187,8 @@ else ifeq ($(platform), wii)
 # ARM
 else ifneq (,$(findstring armv,$(platform)))
 	TARGET := $(TARGET_NAME)_libretro.so
-	SHARED := -shared -Wl,--no-undefined
+	SHARED := -shared -Wl,--version-script=link.T
+	CPU_ARCH := arm
 	fpic := -fPIC
 	CC = gcc
 	ifneq (,$(findstring cortexa8,$(platform)))
@@ -209,8 +211,9 @@ else ifneq (,$(findstring armv,$(platform)))
 		CFLAGS += -mfloat-abi=hard
 		ASFLAGS += -mfloat-abi=hard
 	endif
-	CFLAGS += -DARM
-	HAVE_MMAP = 1
+	HAVE_DYNAREC := 1
+	CFLAGS += -DARM -DARM_ARCH -DARM_MEMORY_DYNAREC
+	LDFLAGS := -Wl,--no-undefined
 
 # emscripten
 else ifeq ($(platform), emscripten)
@@ -222,11 +225,10 @@ else
 	CC = gcc
 	SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=link.T
 	CFLAGS += -D__WIN32__ -D__WIN32_LIBRETRO__
-
-ifeq ($(HAVE_DYNAREC),1)
-	HAVE_MMAP = 1
-	HAVE_MMAP_WIN32 = 1
-endif
+	ifeq ($(HAVE_DYNAREC),1)
+		HAVE_MMAP = 1
+		HAVE_MMAP_WIN32 = 1
+	endif
 
 endif