diff --git a/qt-openzwave/qt-openzwave.pro b/qt-openzwave/qt-openzwave.pro
index 7f1cb5e..b3aaae4 100644
--- a/qt-openzwave/qt-openzwave.pro
+++ b/qt-openzwave/qt-openzwave.pro
@@ -84,23 +84,11 @@ unix {
     target.path = /usr/local/lib
     INSTALLS += target
 }
+LIBS += -L../../open-zwave -lopenzwave
 
 macx {
-#    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
-    FRAMEWORK_HEADERS.version = Versions
-    FRAMEWORK_HEADERS.files = include/qt-openzwave/qtopenzwave.h include/qt-openzwave/qtozwmanager.h \
-        include/qt-openzwave/qtozwproxymodels.h include/qt-openzwave/rep_qtozwmanager_source.h \
-        include/qt-openzwave/qtozw_pods.h include/qt-openzwave/qtozwvalueidmodel.h \
-        include/qt-openzwave/qtozwassociationmodel.h include/qt-openzwave/qtozwnodemodel.h \
-        include/qt-openzwave/rep_qtozwmanager_replica.h include/qt-openzwave_global.h \
-        include/qt-openzwave/qtozwoptions.h
-    FRAMEWORK_HEADERS.path = Headers
-
-    QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
     QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
-    CONFIG +=lib_bundle
-} else {
-    LIBS += -L../../open-zwave -lopenzwave
+    QMAKE_POST_LINK=$$top_srcdir/updaterpath.sh $(TARGET)
 } 
 
 message(" ")
diff --git a/qt-ozwdaemon/qt-ozwdaemon.pro b/qt-ozwdaemon/qt-ozwdaemon.pro
index a60f353..a76be26 100644
--- a/qt-ozwdaemon/qt-ozwdaemon.pro
+++ b/qt-ozwdaemon/qt-ozwdaemon.pro
@@ -4,7 +4,6 @@ QT += remoteobjects
 
 CONFIG += c++11 console silent
 CONFIG -= app_bundle
-CONFIG -= silent
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings
@@ -29,14 +28,12 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 HEADERS += \
     qtozwdaemon.h
 
-LIBS += -lresolv
+LIBS += -lresolv -L../qt-openzwave/ -lqt-openzwave
+INCLUDEPATH += ../qt-openzwave/include/
+
 macx {
-    QMAKE_CXXFLAGS += -F../qt-openzwave/
-    LIBS += -F../qt-openzwave/ -framework qt-openzwave
     ICON = res/ozw_logo.icns
-} else {
-    LIBS += -L../qt-openzwave/ -lqt-openzwave
-    INCLUDEPATH += ../qt-openzwave/include/
+    QMAKE_POST_LINK=$$top_srcdir/updaterpath.sh $(TARGET)
 }
 
 include(../qt-openzwave.pri)
diff --git a/simpleclient/simpleclient.pro b/simpleclient/simpleclient.pro
index 765ba01..1970c81 100644
--- a/simpleclient/simpleclient.pro
+++ b/simpleclient/simpleclient.pro
@@ -31,19 +31,14 @@ HEADERS += \
 RESOURCES += \
     simpleclient.qrc
 
-LIBS += -lresolv
+LIBS += -lresolv -L../qt-openzwave/ -lqt-openzwave
+INCLUDEPATH += ../qt-openzwave/include/
+
 macx {
-    QMAKE_CXXFLAGS += -F../qt-openzwave/
-    LIBS += -F../qt-openzwave/ -framework qt-openzwave
     ICON = res/ozw_logo.icns
-    BUNDLE.files = ../qt-openzwave/qt-openzwave.framework/
-    BUNDLE.path = Contents/Frameworks/qt-openzwave.framework/
-    LIBOZW.files = ../../open-zwave/libopenzwave-1.6.dylib
+    LIBOZW.files = ../../open-zwave/libopenzwave-1.6.dylib ../qt-openzwave/libqt-openzwave.1.0.dylib
     LIBOZW.path = Contents/Frameworks/
     QMAKE_BUNDLE_DATA += BUNDLE LIBOZW
-    INCLUDEPATH += ../qt-openzwave/qt-openzwave/include/
-} else {
-    LIBS += -L../qt-openzwave/ -lqt-openzwave -L../../open-zwave -lopenzwave
-    INCLUDEPATH += ../qt-openzwave/include/
+    QMAKE_POST_LINK=$$top_srcdir/updaterpath.sh $(TARGET)
 }
 include(../qt-openzwave.pri)
diff --git a/updaterpath.sh b/updaterpath.sh
new file mode 100755
index 0000000..3f5534b
--- /dev/null
+++ b/updaterpath.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+OZWPATH=`otool -L $1  | grep libopenzwave | awk '{print $1}'`
+install_name_tool -change $OZWPATH  @rpath/libopenzwave-1.6.dylib $1