diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
index 1cd351fed..362cf1d94 100644
--- a/libretroshare/src/libretroshare.pro
+++ b/libretroshare/src/libretroshare.pro
@@ -58,8 +58,8 @@ win32 {
 
 DEFINES *=  PQI_USE_XPGP MINIUPNPC_VERSION=10
 
-SSL_DIR=../../../../openssl-0.9.7g-xpgp-0.1c
-UPNPC_DIR=../../../../miniupnpc-1.0
+SSL_DIR=../../../openssl-0.9.7g-xpgp-0.1c
+UPNPC_DIR=../../../miniupnpc-1.0
 
 INCLUDEPATH += . $${SSL_DIR}/include $${UPNPC_DIR}
 
diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro
index d8fff7cfe..d27cdac4d 100644
--- a/retroshare-gui/src/RetroShare.pro
+++ b/retroshare-gui/src/RetroShare.pro
@@ -1,4 +1,4 @@
-CONFIG += qt gui uic qrc resources uitools release # pluginmgr debug
+CONFIG += qt gui uic qrc resources uitools # pluginmgr debug
 QT     += network xml script 
 TEMPLATE = app
 TARGET = RetroShare
@@ -13,20 +13,20 @@ MOC_DIR = temp/moc
 linux-g++ {
 	OBJECTS_DIR = temp/linux-g++/obj
 
-	LIBS += ../../../../lib/linux-g++/libretroshare.a 
-	LIBS += ../../../../lib/linux-g++/libminiupnpc.a 
-	LIBS += ../../../../lib/linux-g++/libssl.a 
-	LIBS += ../../../../lib/linux-g++/libcrypto.a
+	LIBS += ../../libretroshare/src/lib.linux-g++/libretroshare.a 
+	LIBS += ../../../lib/linux-g++/libminiupnpc.a 
+	LIBS += ../../../lib/linux-g++/libssl.a 
+	LIBS += ../../../lib/linux-g++/libcrypto.a
 	LIBS += -lQtUiTools
     LIBS += -lz 
 }
 linux-g++-64 {
 	OBJECTS_DIR = temp/linux-g++-64/obj
 
-	LIBS += ../../../../lib/linux-g++-64/libretroshare.a 
-	LIBS += ../../../../lib/linux-g++-64/libminiupnpc.a 
-	LIBS += ../../../../lib/linux-g++-64/libssl.a 
-	LIBS += ../../../../lib/linux-g++-64/libcrypto.a
+	LIBS += ../../libretroshare/src/lib.linux-g++-64/libretroshare.a 
+	LIBS += ../../../../build/lib.linux-g++-64/libminiupnpc.a 
+	LIBS += ../../../../build/lib.linux-g++-64/libssl.a 
+	LIBS += ../../../../build/lib.linux-g++-64/libcrypto.a
     LIBS += -lz
 }
 
diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro
index e67d47617..01f9b6b84 100644
--- a/retroshare-nogui/src/retroshare-nogui.pro
+++ b/retroshare-nogui/src/retroshare-nogui.pro
@@ -6,19 +6,19 @@ TARGET = retroshare-nogui
 linux-g++ {
 	OBJECTS_DIR = temp/linux-g++/obj
 
-	LIBS += ../../../../lib/linux-g++/libretroshare.a 
-	LIBS += ../../../../lib/linux-g++/libminiupnpc.a 
-	LIBS += ../../../../lib/linux-g++/libssl.a 
-	LIBS += ../../../../lib/linux-g++/libcrypto.a
+	LIBS += ../../../lib/linux-g++/libretroshare.a 
+	LIBS += ../../../lib/linux-g++/libminiupnpc.a 
+	LIBS += ../../../lib/linux-g++/libssl.a 
+	LIBS += ../../../lib/linux-g++/libcrypto.a
     LIBS += -lz
 }
 linux-g++-64 {
 	OBJECTS_DIR = temp/linux-g++-64/obj
 
-	LIBS += ../../../../lib/linux-g++-64/libretroshare.a 
-	LIBS += ../../../../lib/linux-g++-64/libminiupnpc.a 
-	LIBS += ../../../../lib/linux-g++-64/libssl.a 
-	LIBS += ../../../../lib/linux-g++-64/libcrypto.a
+	LIBS += ../../libretroshare/src/lib.linux-g++-64/libretroshare.a 
+	LIBS += ../../../../build/lib.linux-g++-64/libminiupnpc.a 
+	LIBS += ../../../../build/lib.linux-g++-64/libssl.a 
+	LIBS += ../../../../build/lib.linux-g++-64/libcrypto.a
     LIBS += -lz
 }
 
@@ -67,6 +67,7 @@ macx {
 
 DEPENDPATH += ../../libretroshare/src
             
+LIBS *= -lpthread
 INCLUDEPATH += . ../../libretroshare/src
 
 # Input