diff --git a/3rdparty/3rdparty.pro b/3rdparty/3rdparty.pro
index 2e8a6be6..f27e7b01 100644
--- a/3rdparty/3rdparty.pro
+++ b/3rdparty/3rdparty.pro
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-SUBDIRS = quazip qextserialport
+SUBDIRS = quazip
+SUBDIRS = qextserialport
 
 CONFIG += ordered
-
diff --git a/3rdparty/qextserialport/qextserialport.pro b/3rdparty/qextserialport/qextserialport.pro
index 93cff132..5fcb46fd 100644
--- a/3rdparty/qextserialport/qextserialport.pro
+++ b/3rdparty/qextserialport/qextserialport.pro
@@ -4,7 +4,7 @@
 # CONFIG += qesp_static
 
 # Uncomment following line if you want to build framework for mac
-#macx:CONFIG += qesp_mac_framework
+macx:CONFIG += qesp_mac_framework
 
 # Uncomment following line if you want to enable udev for linux
 # linux*:CONFIG += qesp_linux_udev
diff --git a/SleepyHeadQT.pro b/SleepyHeadQT.pro
index 8e5eda63..0e44c417 100644
--- a/SleepyHeadQT.pro
+++ b/SleepyHeadQT.pro
@@ -1,20 +1,11 @@
 TEMPLATE = subdirs
 
-
-# Need them for windows..
-win32:CONFIG += use_bundled_libs
-else:CONFIG -= use_bundled_libs
-
-use_bundled_libs {
-    SUBDIRS = 3rdparty
-}
+win32:SUBDIRS = 3rdparty
 
 SUBDIRS += sleepyhead
 
-use_bundled_libs {
-    CONFIG += ordered
-    sleepyhead.depends = 3rdparty
-}
+CONFIG += ordered
+win32:sleepyhead.depends = 3rdparty
 
 TRANSLATIONS += \
     Translations/Nederlands.nl_NL.ts \
diff --git a/sleepyhead/oximetry.cpp b/sleepyhead/oximetry.cpp
index a47e4df5..fd2d5371 100644
--- a/sleepyhead/oximetry.cpp
+++ b/sleepyhead/oximetry.cpp
@@ -13,7 +13,7 @@
 #ifdef USE_BUNDLED_LIBS
 #include "src/qextserialenumerator.h"
 #else
-#include <QtExtSerialPort/qextserialenumerator.h>
+#include <qextserialenumerator.h>
 #endif
 
 #include "oximetry.h"
diff --git a/sleepyhead/oximetry.h b/sleepyhead/oximetry.h
index 22a2a9d0..d2d40b1b 100644
--- a/sleepyhead/oximetry.h
+++ b/sleepyhead/oximetry.h
@@ -17,7 +17,8 @@
 #ifdef USE_BUNDLED_LIBS
 #include "src/qextserialport.h"
 #else
-#include <QtExtSerialPort/qextserialport.h>
+
+#include <qextserialport.h>
 #endif
 
 #include "SleepLib/profiles.h"
diff --git a/sleepyhead/sleepyhead.pro b/sleepyhead/sleepyhead.pro
index cffabd25..2b3df1c5 100644
--- a/sleepyhead/sleepyhead.pro
+++ b/sleepyhead/sleepyhead.pro
@@ -14,6 +14,11 @@ greaterThan(QT_MAJOR_VERSION,4) {
 
 CONFIG += rtti
 
+win32:CONFIG += use_bundled_libs
+else:!use_bundled_libs:CONFIG += extserialport
+
+use_bundled_libs:DEFINES += USE_BUNDLED_LIBS
+
 #static {
 #    CONFIG += static
 #    QTPLUGIN += qsvg qgif qpng
@@ -54,10 +59,6 @@ if (win32-msvc2008|win32-msvc2010|win32-msvc2012):!equals(TEMPLATE_PREFIX, "vc")
 }
 
 
-win32:CONFIG += use_bundled_libs
-
-use_bundled_libs:DEFINES += USE_BUNDLED_LIBS
-
 #include(..3rdparty/qextserialport/src/qextserialport.pri)
 #include(3rdparty/quazip-0.5.1/quazip/quazip.pri)
 
@@ -211,11 +212,12 @@ mac {
     QMAKE_BUNDLE_DATA += TransFiles
 }
 
-
 win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/quazip/quazip/release/ -lquazip
 else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/quazip/quazip/debug/ -lquazip
 else:unix {
-    use_bundled_libs:QMAKE_LFLAGS += -L$$OUT_PWD/../3rdparty/qextserialport/
+    use_bundled_libs:QMAKE_LFLAGS += -L$$OUT_PWD/../3rdparty/quazip/
+    else:QMAKE_LFLAGS += -L/usr/lib -L/usr/local/lib
+
     LIBS += -lquazip
 }
 
@@ -225,27 +227,50 @@ use_bundled_libs {
 } else {
     INCLUDEPATH += /usr/include
     INCLUDEPATH += /usr/local/include
+    DEPENDPATH += /usr/include/quazip
+    DEPENDPATH += /usr/local/include/quazip
 }
 
-greaterThan(QT_MAJOR_VERSION,4) {
+#greaterThan(QT_MAJOR_VERSION,4) {
 
-    win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lQt5ExtSerialPort1
-    else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lQt5ExtSerialPortd1
-    else:unix{
-        use_bundled_libs:QMAKE_LFLAGS += -L$$OUT_PWD/../3rdparty/qextserialport/
-        LIBS += -lqextserialport
+#    win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lQt5ExtSerialPort1
+#    else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lQt5ExtSerialPortd1
+#    else:unix{
+#        use_bundled_libs:QMAKE_LFLAGS += -L$$OUT_PWD/../3rdparty/qextserialport/
+#        LIBS += -lqextserialport
+#    }
+
+#} else {
+#    win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lqextserialport
+#    else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lqextserialport
+#    else:unix {
+#        use_bundled_libs:QMAKE_LFLAGS += -L$$OUT_PWD/../3rdparty/qextserialport/
+#        LIBS += -lqextserialport
+#    }
+#}
+
+#use_bundled_libs {
+#}
+
+use_bundled_libs: {
+    greaterThan(QT_MAJOR_VERSION,4) {
+        win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lQt5ExtSerialPort1
+        else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lQt5ExtSerialPortd1
+        else:unix:CONFIG(release, debug|release): LIBS += -lQt5ExtSerialPort1
+        else:unix:CONFIG(debug, debug|release): LIBS += -lQt5ExtSerialPortd1
+    } else {
+        win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lqextserialport
+        else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lqextserialport
+        else:unix: LIBS += -lqextserialport
     }
-
-} else {
-    win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lqextserialport
-    else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lqextserialport
-    else:unix {
-        use_bundled_libs:QMAKE_LFLAGS += -L$$OUT_PWD/../3rdparty/qextserialport/
-        LIBS += -lqextserialport
-    }
-}
-
-use_bundled_libs {
     INCLUDEPATH += $$PWD/../3rdparty/qextserialport
     DEPENDPATH += $$PWD/../3rdparty/qextserialport
+} else {
+    mac: LIBS += -framework qextserialport
+    else:unix: LIBS += -lqextserialport
+
+    INCLUDEPATH += /usr/local/include
+    INCLUDEPATH += /usr/include
+    DEPENDPATH += /usr/local/include/QtExtSerialPort
+    DEPENDPATH += /usr/include/QtExtSerialPort
 }