diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri
index b3f8940..bf420ae 100644
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@@ -30,21 +30,21 @@ win32-msvc2008|win32-msvc2010 {
 DEFINES += _TTY_NOWARN_
 
 # MAC OS X
-macx|macx-g++42|macx-g++: {
+macx|macx-g++42|macx-g++|macx-llvm: {
 
         CONFIG += x86_64 cocoa phonon
         CONFIG -= x86
 
 	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
 
-        INCLUDEPATH += -framework SDL
+        INCLUDEPATH += $$BASEDIR/libs/lib/Frameworks/SDL.framework/Headers
 
-	LIBS += -framework IOKit \
+        LIBS += -framework IOKit \
                 -F$$BASEDIR/libs/lib/Frameworks \
-		-framework SDL \
-		-framework CoreFoundation \
-		-framework ApplicationServices \
-		-lm
+                -framework SDL \
+                -framework CoreFoundation \
+                -framework ApplicationServices \
+                -lm
 
 	ICON = $$BASEDIR/files/images/icons/macx.icns
 
diff --git a/src/input/JoystickInput.h b/src/input/JoystickInput.h
index f8b369e..281e02d 100644
--- a/src/input/JoystickInput.h
+++ b/src/input/JoystickInput.h
@@ -36,7 +36,11 @@ This file is part of the PIXHAWK project
 #include <QThread>
 #include <QList>
 #include <qmutex.h>
+#ifdef Q_OS_MAC
+#include <SDL.h>
+#else
 #include <SDL/SDL.h>
+#endif
 
 #include "UASInterface.h"