diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri
index 9a06576a959f9880f10ecd051e6d66e4c538c624..20f67e28c6cfacdfb94b4aa4d738f888801e1fae 100644
--- a/QGCExternalLibs.pri
+++ b/QGCExternalLibs.pri
@@ -173,7 +173,7 @@ MacBuild {
 
     LIBS += \
         -F$$BASEDIR/libs/lib/Frameworks \
-        -framework SDL
+        -framework SDL2
 } else:LinuxBuild {
     PKGCONFIG = sdl2
 } else:WindowsBuild {
diff --git a/QGCSetup.pri b/QGCSetup.pri
index 6a112f52a48f9b8b72036bbb166bee395427b0b0..1a91836f2feae28c4c822869c5214316cce20fe1 100644
--- a/QGCSetup.pri
+++ b/QGCSetup.pri
@@ -49,8 +49,8 @@ iOSBuild | MacBuild {
 MacBuild {
     # Copy non-standard frameworks into app package
     QMAKE_POST_LINK += && rsync -a --delete $$BASEDIR/libs/lib/Frameworks $$DESTDIR/$${TARGET}.app/Contents/
-    # SDL Framework
-    QMAKE_POST_LINK += && install_name_tool -change "@rpath/SDL.framework/Versions/A/SDL" "@executable_path/../Frameworks/SDL.framework/Versions/A/SDL" $$DESTDIR/$${TARGET}.app/Contents/MacOS/$${TARGET}
+    # SDL2 Framework
+    QMAKE_POST_LINK += && install_name_tool -change "@rpath/SDL2.framework/Versions/A/SDL2" "@executable_path/../Frameworks/SDL2.framework/Versions/A/SDL2" $$DESTDIR/$${TARGET}.app/Contents/MacOS/$${TARGET}
 }
 
 WindowsBuild {
@@ -62,7 +62,7 @@ WindowsBuild {
     DebugBuild: DLL_QT_DEBUGCHAR = "d"
     ReleaseBuild: DLL_QT_DEBUGCHAR = ""
     COPY_FILE_LIST = \
-        $$BASEDIR\\libs\\lib\\sdl\\win32\\SDL.dll \
+        $$BASEDIR\\libs\\lib\\sdl2\\win32\\SDL2.dll \
         $$BASEDIR\\libs\\thirdParty\\libxbee\\lib\\libxbee.dll \
         $$BASEDIR\\deploy\\libeay32.dll
 
diff --git a/src/Joystick/JoystickSDL.cc b/src/Joystick/JoystickSDL.cc
index 25848263681dc23e69433bb372d5d682228c929a..ea481d206191129bb93799ea83b4652c2e5026cb 100644
--- a/src/Joystick/JoystickSDL.cc
+++ b/src/Joystick/JoystickSDL.cc
@@ -23,7 +23,16 @@ QMap<QString, Joystick*> JoystickSDL::discover(MultiVehicleManager* _multiVehicl
     qCDebug(JoystickLog) << "Available joysticks";
 
     for (int i=0; i<SDL_NumJoysticks(); i++) {
-        QString name = SDL_JoystickName(i);
+        QString name = SDL_JoystickNameForIndex(i);
+
+        if (SDL_IsGameController(i)) {
+            qDebug() << name << "supports SDL GameController!";
+        } else {
+            qDebug() << name << "DOES NOT support SDL GameController!";
+        }
+
+        SDL_GameController* sdlController = SDL_GameControllerOpen(i);
+        qDebug() << SDL_GetError();
 
         if (!ret.contains(name)) {
             int axisCount, buttonCount, hatCount;