diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro
index ddb14d57c..a8d9ef034 100644
--- a/retroshare-gui/src/RetroShare.pro
+++ b/retroshare-gui/src/RetroShare.pro
@@ -1,4 +1,4 @@
-CONFIG += qt gui uic qrc resources uitools newsettings 
+CONFIG += qt gui uic qrc resources newsettings 
 QT     += network xml script opengl
 
 TEMPLATE = app
@@ -94,10 +94,13 @@ macx {
     # ENABLE THIS OPTION FOR Univeral Binary BUILD.
     # CONFIG += ppc x86 
 
-    LIBS += -Wl,-search_paths_first
-    LIBS += -L"../../../../lib" -lretroshare -lssl -lcrypto -lminiupnpc -lz
-    LIBS += -lgpgme
-    LIBS += -lQtUiTools
+	CONFIG += version_detail_bash_script
+	LIBS += ../../libretroshare/src/lib/libretroshare.a
+        LIBS += -lssl -lcrypto -lz -lgpgme -lgpg-error
+	LIBS += ../../../miniupnpc-1.0/libminiupnpc.a
+
+    	INCLUDEPATH += .
+
 }
 
 ############################## Common stuff ######################################
diff --git a/retroshare-gui/src/gui/toaster/QtToaster.cpp b/retroshare-gui/src/gui/toaster/QtToaster.cpp
index 32e885b0b..a5677131b 100644
--- a/retroshare-gui/src/gui/toaster/QtToaster.cpp
+++ b/retroshare-gui/src/gui/toaster/QtToaster.cpp
@@ -26,10 +26,6 @@
 
 #include <QtGui/QtGui>
 
-#ifdef OS_MACOSX
-#include <MacWindows.h>
-#endif
-
 static const unsigned TIME_TO_SHOW = 20;
 
 QtToaster::QtToaster(QWidget * toaster, QFrame * toasterWindowFrame)
@@ -41,14 +37,7 @@ QtToaster::QtToaster(QWidget * toaster, QFrame * toasterWindowFrame)
 	_toaster = toaster;
 	_toaster->setParent(_toaster->parentWidget(), Qt::ToolTip | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
 	
-#ifdef OS_MACOSX
-	// Make sure the other windows of the application are not raised when the
-	// toaster appears
-	WId wid = _toaster->winId();
-	SetWindowGroup((WindowRef)wid, NULL);
-#else
 	_toaster->setWindowFlags(_toaster->windowFlags() | Qt::ToolTip);
-#endif	
 
 	WidgetBackgroundImage::setBackgroundImage(toasterWindowFrame, ":images/toaster/toaster-backrs4.png", WidgetBackgroundImage::AdjustSize);