diff --git a/lime/tools/helpers/PlatformHelper.hx b/lime/tools/helpers/PlatformHelper.hx
index 853d44b9d..628941c12 100644
--- a/lime/tools/helpers/PlatformHelper.hx
+++ b/lime/tools/helpers/PlatformHelper.hx
@@ -44,12 +44,19 @@ class PlatformHelper {
 					process.exitCode ();
 					process.close ();
 					
-					if (output.indexOf ("64") > -1) {
+					if (output.indexOf ("armv6") > -1) {
+						
+						_hostArchitecture = Architecture.ARMV6;
+						
+					} else if (output.indexOf ("armv7") > -1) {
+						
+						_hostArchitecture = Architecture.ARMV7;
+						
+					} else if (output.indexOf ("64") > -1) {
 						
 						_hostArchitecture = Architecture.X64;
 						
 					} else {
-						
 						_hostArchitecture = Architecture.X86;
 						
 					}
diff --git a/lime/tools/platforms/LinuxPlatform.hx b/lime/tools/platforms/LinuxPlatform.hx
index 621c931e4..dc9fe6f3e 100644
--- a/lime/tools/platforms/LinuxPlatform.hx
+++ b/lime/tools/platforms/LinuxPlatform.hx
@@ -50,7 +50,7 @@ class LinuxPlatform extends PlatformTarget {
 		if (project.targetFlags.exists ("rpi")) {
 			
 			isRaspberryPi = true;
-			is64 = true;
+			is64 = false;
 			
 		} else if (PlatformHelper.hostPlatform == Platform.LINUX) {
 			
diff --git a/run.n b/run.n
index e4a36a060..ae4568d2c 100644
Binary files a/run.n and b/run.n differ
diff --git a/tools/CommandLineTools.hx b/tools/CommandLineTools.hx
index e436e62b1..123aba67d 100644
--- a/tools/CommandLineTools.hx
+++ b/tools/CommandLineTools.hx
@@ -456,7 +456,7 @@ class CommandLineTools {
 					
 				}
 				
-				if (raspberryPi) {
+				if (raspberryPi || PlatformHelper.hostArchitecture == Architecture.ARMV6 || PlatformHelper.hostArchitecture == Architecture.ARMV7) {
 					
 					untyped $loader.path = $array (path + "RPi/", $loader.path);
 					
diff --git a/tools/RunScript.hx b/tools/RunScript.hx
index 13487dfd5..4e8ceea24 100644
--- a/tools/RunScript.hx
+++ b/tools/RunScript.hx
@@ -81,7 +81,7 @@ class RunScript {
 					
 					case "Linux":
 						
-						if (PlatformHelper.hostPlatform == LINUX && PlatformHelper.hostArchitecture == X86) {
+						if (PlatformHelper.hostPlatform == LINUX && PlatformHelper.hostArchitecture != X64) {
 							
 							ProcessHelper.runCommand (limeDirectory, "neko", args.concat ([ "linux", "-32", toolsDirectory ]));