diff --git a/SDL/CMakeLists.txt b/SDL/CMakeLists.txt
index 0782cc494f..12f42148ce 100644
--- a/SDL/CMakeLists.txt
+++ b/SDL/CMakeLists.txt
@@ -14,7 +14,13 @@ endif()
 
 # TODO: Rely on compiler define instead. __BLACKBERRY__ ?
 if (BLACKBERRY)
-    add_definitions(-DBLACKBERRY)
+    message("Building for Blackberry")
+	add_definitions(-DBLACKBERRY)
+	if (BLACKBERRY GREATER 10)
+		add_definitions(-DBLACKBERRY10)
+	endif()
+else()
+    message("Not building for Blackberry")
 endif()
 
 
@@ -28,9 +34,7 @@ add_definitions(-DSDL)
 add_definitions(-Wno-multichar)
 add_definitions(-fno-strict-aliasing)
 add_definitions(-DUSE_PROFILER)
-if (NOT BLACKBERRY)
-    add_definitions(-D_DEBUG)
-endif()
+add_definitions(-D_DEBUG)
 
 if (UNIX)
 	if (NOT APPLE)  # can't build the SDL .m file with -std=gnu++0x
@@ -75,11 +79,11 @@ add_subdirectory(../Core Core)
 
 set(LIBS ${LIBS} ${SDL_LIBRARY} file lin ${PNG_LIBRARY} z gfx gfx_es2 image stb_image mixer net ui profiler timeutil file zip base lin vjson stb_vorbis sha1 jsonwriter common core gpu kirk)
 
-# TODO: Blackberry specific libs (eg. TCO)
+# TODO: Blackberry specific libs 
 if(BLACKBERRY)
-    set(LIBS ${LIBS} bps screen socket EGL GLESv2)
+	set(LIBS ${LIBS} bps screen socket EGL GLESv2)
 else()
-    set(LIBS ${LIBS} ${OPENGL_LIBRARIES} GLEW etcdec)
+	set(LIBS ${LIBS} ${OPENGL_LIBRARIES} GLEW etcdec)
 endif()
 
 set(FILES
diff --git a/SDL/build_for_playbook.sh b/SDL/blackberry_build.sh
similarity index 82%
rename from SDL/build_for_playbook.sh
rename to SDL/blackberry_build.sh
index 369ca96e36..30ccc88178 100755
--- a/SDL/build_for_playbook.sh
+++ b/SDL/blackberry_build.sh
@@ -1,6 +1,19 @@
 #!/bin/bash
 
 BUILD_TYPE=Release
+
+if type "arm-unknown-nto-qnx8.0.0eabi-cpp" >/dev/null 2>&1; then
+    BB_OS=10.0.9
+    echo "Building for Blackberry 10.0"
+elif type "arm-unknown-nto-qnx6.5.0eabi-cpp" >/dev/null 2>&1; then
+    BB_OS=2.1.0
+    echo "Building for Blackberry 2.1"
+else
+    echo "Could not find your Blackberry NDK. Please source bbndk-env.sh"
+    exit
+fi
+
+
 if [ -z "$PPSSPP_ROOT" ]; then
 	PPSSPP_ROOT=${PWD}/..
 fi
@@ -13,8 +26,6 @@ PKG_CONFIG_LIBDIR=${PROJECT_ROOT}/install/lib/pkgconfig
 SDL_PROJECT=${PROJECT_ROOT}/SDL
 SDLIMAGE_PROJECT=${PROJECT_ROOT}/SDL_image
 SDLMIXER_PROJECT=${PROJECT_ROOT}/SDL_mixer
-SDLNET_PROJECT=${PROJECT_ROOT}/SDL_net
-SDLTTF_PROJECT=${PROJECT_ROOT}/SDL_ttf
 
 while true; do
 	case "$1" in
@@ -35,8 +46,6 @@ while true; do
 		echo "  --tco PATH                   TouchControlOverlay project directory (default is TouchControlOverlay)"
 		echo "  --sdl_image PATH             SDL_image project directory (default is SDL_image)"
 		echo "  --sdl_mixer PATH             SDL_mixer project directory (default is SDL_mixer)"
-		echo "  --sdl_net PATH               SDL_net project directory (default is SDL_net)"
-		echo "  --sdl_ttf PATH               SDL_ttf project directory (default is SDL_ttf)"
 		echo "  --ogg PATH                   ogg project directory (default is ogg)"
 		echo "  --vorbis PATH                vorbis project directory (default is vorbis)"
 		exit 0
@@ -48,8 +57,6 @@ while true; do
 	--sdl ) SDL_PROJECT="$2"; shift 2 ;;
 	--sdl_image ) SDLIMAGE_PROJECT="$2"; shift 2 ;;
 	--sdl_mixer ) SDLMIXER_PROJECT="$2"; shift 2 ;;
-	--sdl_net ) SDLNET_PROJECT="$2"; shift 2 ;;
-	--sdl_ttf ) SDLTTF_PROJECT="$2"; shift 2 ;;
 	--tco ) TCO_PROJECT="$2"; shift 2 ;;
 	--ogg ) OGG_PROJECT="$2"; shift 2 ;;
 	--vorbis ) VORBIS_PROJECT="$2"; shift 2 ;;
@@ -67,12 +74,6 @@ fi
 if [ -z "$SDLMIXER_PROJECT" ]; then
 	SDLMIXER_PROJECT="$PROJECT_ROOT/SDL_mixer"
 fi
-if [ -z "$SDLNET_PROJECT" ]; then
-	SDLNET_PROJECT="$PROJECT_ROOT/SDL_net"
-fi
-if [ -z "$SDLTTF_PROJECT" ]; then
-	SDLTTF_PROJECT="$PROJECT_ROOT/SDL_ttf"
-fi
 if [ -z "$TCO_PROJECT" ]; then
 	TCO_PROJECT="$PROJECT_ROOT/TouchControlOverlay"
 fi
@@ -107,15 +108,9 @@ cmake \
 -DSDLMIXER_INCLUDE_DIR="${SDLMIXER_PROJECT}" \
 -DSDLMIXER_LIBRARY="${SDLMIXER_PROJECT}/Device-${BUILD_TYPE}/libSDL_mixer.so;${OGG_PROJECT}/Device-${BUILD_TYPE}/libogg.so;${VORBIS_PROJECT}/Device-${BUILD_TYPE}/libvorbis.so" \
 -DSDLMIXER_FOUND=ON \
--DSDLNET_INCLUDE_DIR="${SDLNET_PROJECT}" \
--DSDLNET_LIBRARY="${SDLNET_PROJECT}/Device-${BUILD_TYPE}/libSDL_net.so;${QNX_TARGET}/armle-v7/lib/libsocket.so" \
--DSDLNET_FOUND=ON \
--DSDLTTF_INCLUDE_DIR="${SDLTTF_PROJECT}" \
--DSDLTTF_LIBRARY="${SDLTTF_PROJECT}/Device-${BUILD_TYPE}/libSDL_ttf.so" \
--DSDLTTF_FOUND=ON \
 -DPNG_LIBRARY="${QNX_TARGET}/armle-v7/usr/lib/libpng.so" \
 -DPNG_PNG_INCLUDE_DIR="${QNX_TARGET}/usr/include" \
--DBLACKBERRY=10.0.9 \
+-DBLACKBERRY=${BB_OS} \
 -DARM=7 \
 ${PWD}
 
diff --git a/SDL/package_for_playbook.sh b/SDL/blackberry_package.sh
similarity index 80%
rename from SDL/package_for_playbook.sh
rename to SDL/blackberry_package.sh
index 7568897119..bb52f854b5 100755
--- a/SDL/package_for_playbook.sh
+++ b/SDL/blackberry_package.sh
@@ -4,12 +4,10 @@ TYPE=Device-Release
 PPSSPP_ROOT=${PWD}/..
 WORKSPACE=${PPSSPP_ROOT}/..
 blackberry-nativepackager -package PPSSPP.bar bar-descriptor.xml ppsspp \
--devMode -debugToken ~/debugtoken.bar \
 -e icon-114.png icon-114.png \
+-devMode -debugToken ~/debugtoken.bar \
 -e ../android/assets assets \
 -e ${WORKSPACE}/SDL12/${TYPE}/libSDL12.so lib/libSDL12.so \
 -e ${WORKSPACE}/TouchControlOverlay/${TYPE}/libTouchControlOverlay.so lib/libTouchControlOverlay.so \
 -e ${WORKSPACE}/SDL_image/${TYPE}/libSDL_image.so lib/libSDL_image.so \
--e ${WORKSPACE}/SDL_mixer/${TYPE}/libSDL_mixer.so lib/libSDL_mixer.so \
--e ${WORKSPACE}/SDL_net/${TYPE}/libSDL_net.so lib/libSDL_net.so \
--e ${WORKSPACE}/SDL_ttf/${TYPE}/libSDL_ttf.so lib/libSDL_ttf.so
+-e ${WORKSPACE}/SDL_mixer/${TYPE}/libSDL_mixer.so lib/libSDL_mixer.so