diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro
index 086c852aca..e05de953b5 100644
--- a/Qt/PPSSPP.pro
+++ b/Qt/PPSSPP.pro
@@ -10,13 +10,6 @@ lessThan(QT_MAJOR_VERSION, 5) {
 }
 
 # Extra Qt modules
-linux:lessThan(QT_MAJOR_VERSION,5):!exists($$[QT_INSTALL_HEADERS]/QtMultimedia) {
-	# Ubuntu et al workaround. They forgot QtMultimedia
-	CONFIG += mobility
-	MOBILITY += multimedia
-}
-else: QT += multimedia
-
 greaterThan(QT_MAJOR_VERSION,4) {
 	QT += widgets
 	mobile_platform: QT += sensors
@@ -69,6 +62,7 @@ macx|linux {
 		}
 	}
 }
+
 linux:!android: LIBS += -ldl -lrt
 macx: LIBS += -liconv
 qnx: LIBS += -lscreen
@@ -78,6 +72,16 @@ unix:contains(QT_CONFIG, system-zlib) {
 	LIBS += -lz
 }
 
+# Qt Multimedia (if SDL is not found)
+!contains(DEFINES, QT_HAS_SDL) {
+	linux:lessThan(QT_MAJOR_VERSION,5):!exists($$[QT_INSTALL_HEADERS]/QtMultimedia) {
+		# Fallback to mobility audio
+		CONFIG += mobility
+		MOBILITY += multimedia
+	}
+	else: QT += multimedia
+}
+
 # Main
 SOURCES += $$P/native/base/QtMain.cpp
 HEADERS += $$P/native/base/QtMain.h
diff --git a/Qt/Settings.pri b/Qt/Settings.pri
index ba6840fa33..eb5a26230b 100644
--- a/Qt/Settings.pri
+++ b/Qt/Settings.pri
@@ -72,7 +72,10 @@ contains(QT_CONFIG, opengles.) {
 contains(MEEGO_EDITION,harmattan): DEFINES += "_SYS_UCONTEXT_H=1"
 maemo: DEFINES += MAEMO
 
-macx: INCLUDEPATH += $$P/ffmpeg/macosx/x86_64/include
+macx {
+	QMAKE_MAC_SDK=macosx10.9
+	INCLUDEPATH += $$P/ffmpeg/macosx/x86_64/include
+}
 ios: INCLUDEPATH += $$P/ffmpeg/ios/universal/include
 android {
 	DEFINES += ANDROID
diff --git a/native b/native
index 179347a493..8538a5bf74 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit 179347a493ed58af9ecaefb8695b2a84a1d8d3a0
+Subproject commit 8538a5bf74e50bffff193b818062f061e8dd9763