diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74eb39bd30..de7706e16c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,13 @@ if(RPI)
 	set(MOBILE_DEVICE OFF)
 endif()
 
+if(BB)
+	set(MOBILE_DEVICE OFF)
+	set(ARMV7 ON)
+	set(USING_FBDEV ON)
+endif()
+
+
 if(USING_EGL)
 	# Default to GLES2 but could be GL.
 	set(USING_GLES2 ON)
@@ -74,6 +81,7 @@ option(ANDROID "Set to ON if targeting an Android device" ${ANDROID})
 option(BLACKBERRY "Set to ON if targeting a Blackberry device" ${BLACKBERRY})
 option(IOS "Set to ON if targeting an iOS device" ${IOS})
 option(MAEMO "Set to ON if targeting a Maemo (N900) device" ${MAEMO})
+option(BB "Set to ON if targeting a Beaglebone/Beaglebone Black device" ${BB})
 # :: Environments
 option(USING_EGL "Set to ON if target environment uses EGL" ${USING_EGL})
 option(USING_FBDEV "Set to ON if target environment uses fbdev (eg. Pandora)" ${USING_FBDEV})
@@ -409,7 +417,11 @@ if(USE_FFMPEG AND NOT DEFINED FFMPEG_BUILDDIR)
 	elseif(MACOSX)
 		set(PLATFORM_ARCH "macosx/x86_64")
 	elseif(LINUX)
-		if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+		if(ARMV7)
+			set(PLATFORM_ARCH "linux/armv7")
+		elseif(ARM)
+			set(PLATFORM_ARCH "linux/arm")
+		elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
 			set(PLATFORM_ARCH "linux/x86_64")
 		else()
 			set(PLATFORM_ARCH "linux/x86")
@@ -684,7 +696,11 @@ set(nativeExtra)
 set(nativeExtraLibs)
 
 if(ARMV7)
-	set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -march=armv7-a -mfpu=neon -mcpu=cortex-a9")
+	if(BB)
+		set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -march=armv7-a -mfpu=neon -mcpu=cortex-a8")
+	else()
+		set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -march=armv7-a -mfpu=neon -mcpu=cortex-a9")
+	endif()
 	set(nativeExtra ${nativeExtra}
     native/math/fast/fast_matrix_neon.S)
 endif()
diff --git a/Common/MemArena.cpp b/Common/MemArena.cpp
index 1414afe549..2dbf2a17dd 100644
--- a/Common/MemArena.cpp
+++ b/Common/MemArena.cpp
@@ -99,6 +99,8 @@ int ashmem_unpin_region(int fd, size_t offset, size_t len)
 // do not make this "static"
 #ifdef MAEMO
 std::string ram_temp_file = "/home/user/gc_mem.tmp";
+#elif defined(BB)
+std::string ram_temp_file = "/home/root/gc_mem.tmp";
 #else
 std::string ram_temp_file = "/tmp/gc_mem.tmp";
 #endif