diff --git a/Include/Linux-Arm/OniPlatformLinux-Arm.h b/Include/Linux-Arm/OniPlatformLinux-Arm.h
index fb96323b..1546fb49 100644
--- a/Include/Linux-Arm/OniPlatformLinux-Arm.h
+++ b/Include/Linux-Arm/OniPlatformLinux-Arm.h
@@ -34,3 +34,4 @@
 
 #endif //_ONI_PLATFORM_LINUX_ARM_H_
 
+
diff --git a/ThirdParty/PSCommon/BuildSystem/CommonDefs.mak b/ThirdParty/PSCommon/BuildSystem/CommonDefs.mak
index dd88b04c..de4a17de 100644
--- a/ThirdParty/PSCommon/BuildSystem/CommonDefs.mak
+++ b/ThirdParty/PSCommon/BuildSystem/CommonDefs.mak
@@ -16,6 +16,8 @@ else ifneq (,$(findstring i686,$(MACHINE)))
 	HOST_PLATFORM = x86
 else ifneq (,$(findstring i386,$(MACHINE)))
 	HOST_PLATFORM = x86
+else ifneq (,$(findstring armv6l,$(MACHINE)))
+	HOST_PLATFORM = Armv6l
 else ifneq (,$(findstring arm,$(MACHINE)))
 	HOST_PLATFORM = Arm
 else
diff --git a/ThirdParty/PSCommon/BuildSystem/Platform.Armv6l b/ThirdParty/PSCommon/BuildSystem/Platform.Armv6l
new file mode 100644
index 00000000..be11a0c8
--- /dev/null
+++ b/ThirdParty/PSCommon/BuildSystem/Platform.Armv6l
@@ -0,0 +1,14 @@
+# Platform defs for Raspberry PI Hard floats
+
+ifeq "$(CFG)" "Release"
+
+    # Hardware specifying flags
+     CFLAGS += -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard
+
+    # Optimization level, minus currently buggy optimizing methods (which break bit-exact)
+    CFLAGS += -O3 -fno-tree-pre -fno-strict-aliasing
+
+    # More optimization flags
+    CFLAGS += -ftree-vectorize -ffast-math -funsafe-math-optimizations -fsingle-precision-constant
+
+endif
diff --git a/ThirdParty/PSCommon/XnLib/Source/Linux/XnLinuxUSBDevice.cpp b/ThirdParty/PSCommon/XnLib/Source/Linux/XnLinuxUSBDevice.cpp
index 35593211..8806288f 100644
--- a/ThirdParty/PSCommon/XnLib/Source/Linux/XnLinuxUSBDevice.cpp
+++ b/ThirdParty/PSCommon/XnLib/Source/Linux/XnLinuxUSBDevice.cpp
@@ -23,7 +23,8 @@
 //---------------------------------------------------------------------------
 #include <XnPlatform.h>
 
-#if (XN_PLATFORM == XN_PLATFORM_LINUX_ARM)
+// #if (XN_PLATFORM == XN_PLATFORM_LINUX_ARM)
+#if 0
 
 #include <XnUSBDevice.h>
 #include <linux/usb/gadgetfs.h>