diff --git a/libretro-build-common.sh b/libretro-build-common.sh
index 43465b76..38c9e41a 100755
--- a/libretro-build-common.sh
+++ b/libretro-build-common.sh
@@ -311,6 +311,10 @@ build_libretro_gpsp() {
 	build_libretro_generic_makefile "gpsp" "." "Makefile" $FORMAT_COMPILER_TARGET_ALT
 }
 
+build_libretro_fuse() {
+	build_libretro_generic_makefile "fuse" "." "Makefile.libretro" $FORMAT_COMPILER_TARGET_ALT
+}
+
 build_libretro_vba_next() {
 	build_libretro_generic_makefile "vba_next" "." "Makefile.libretro" $FORMAT_COMPILER_TARGET_ALT
 }
diff --git a/libretro-build-ios.sh b/libretro-build-ios.sh
index 9725ffef..65b952aa 100755
--- a/libretro-build-ios.sh
+++ b/libretro-build-ios.sh
@@ -180,6 +180,7 @@ else
 	build_libretro_o2em
 	build_libretro_hatari
 	build_libretro_gpsp
+	build_libretro_fuse
 	build_libretro_emux
 	build_libretro_test
 	if [ $FORMAT_COMPILER_TARGET != "ios" ]; then
diff --git a/libretro-build-qnx.sh b/libretro-build-qnx.sh
index f994239f..51115fa1 100755
--- a/libretro-build-qnx.sh
+++ b/libretro-build-qnx.sh
@@ -3,6 +3,7 @@
 
 SCRIPT=$(readlink -f $0)
 BASE_DIR=$(dirname $SCRIPT)
+WORKDIR=$PWD
 RARCH_DIR=$BASE_DIR/dist
 RARCH_DIST_DIR=$RARCH_DIR/qnx
 FORMAT=_qnx
@@ -12,6 +13,10 @@ FORMAT_EXT=so
 JOBS=7
 MAKE=make
 
+CC="qcc -Vgcc_ntoarmv7le"
+CXX="QCC -Vgcc_ntoarmv7le"
+CXX11="QCC -Vgcc_ntoarmv7le"
+
 . ./libretro-build-common.sh
 
 if [ $1 ]; then
diff --git a/libretro-build.sh b/libretro-build.sh
index 5cd2be44..db6b610c 100755
--- a/libretro-build.sh
+++ b/libretro-build.sh
@@ -178,7 +178,9 @@ else
 	build_libretro_o2em
 	build_libretro_hatari
 	build_libretro_gpsp
+	build_libretro_fuse
 	build_libretro_emux
+	build_libretro_fuse
 	build_libretro_test
 	if [ $FORMAT_COMPILER_TARGET != "ios" ]; then
 		build_libretro_testgl
diff --git a/libretro-fetch.sh b/libretro-fetch.sh
index 28ac58c8..4b8646f8 100755
--- a/libretro-fetch.sh
+++ b/libretro-fetch.sh
@@ -291,9 +291,13 @@ fetch_libretro_emux() {
 	fetch_git "https://github.com/libretro/emux.git" "libretro-emux" "libretro/Emux"
 }
 
+fetch_libretro_fuse() {
+	fetch_git "https://github.com/libretro/fuse-libretro.git" "libretro-fuse" "libretro/fuse"
+}
+
 # Shouldn't this be part of the tools fetch?  Eh, later...
-fetch_libretro_sdk() {
-	fetch_git "https://github.com/libretro/libretro-sdk.git" "libretro-sdk" "libretro/SDK"
+fetch_libretro_common() {
+	fetch_git "https://github.com/libretro/libretro-common.git" "libretro-common" "libretro/common"
 }
 
 
@@ -366,5 +370,6 @@ else
 	fetch_libretro_tempgba
 	fetch_libretro_gpsp
 	fetch_libretro_emux
-	fetch_libretro_sdk
+	fetch_libretro_common
+	fetch_libretro_fuse
 fi