diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
index 0148a7061..5fd192e5b 100644
--- a/libretroshare/src/libretroshare.pro
+++ b/libretroshare/src/libretroshare.pro
@@ -266,18 +266,18 @@ mac {
 		OBJECTS_DIR = temp/obj
 		MOC_DIR = temp/moc
 		#DEFINES = WINDOWS_SYS WIN32 STATICLIB MINGW
-                #DEFINES *= MINIUPNPC_VERSION=13
+                DEFINES *= MINIUPNPC_VERSION=13
 
 		CONFIG += upnp_miniupnpc
 
 		# zeroconf disabled at the end of libretroshare.pro (but need the code)
-		CONFIG += zeroconf
-		CONFIG += zcnatassist
+		#CONFIG += zeroconf
+		#CONFIG += zcnatassist
 
 		# Beautiful Hack to fix 64bit file access.
                 QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dfopen64=fopen -Dvstatfs64=vstatfs
 
-                UPNPC_DIR = ../../../miniupnpc-1.0
+                UPNPC_DIR = ../../../miniupnpc-1.3
 		#GPG_ERROR_DIR = ../../../../libgpg-error-1.7
 		#GPGME_DIR  = ../../../../gpgme-1.1.8
 
diff --git a/libretroshare/src/rsserver/rsloginhandler.cc b/libretroshare/src/rsserver/rsloginhandler.cc
index b8b9a66fd..dabaea01b 100644
--- a/libretroshare/src/rsserver/rsloginhandler.cc
+++ b/libretroshare/src/rsserver/rsloginhandler.cc
@@ -4,7 +4,6 @@
 #include "rsloginhandler.h"
 #include "util/rsdir.h"
 #include "rsaccounts.h"
-
 #if defined(UBUNTU) || defined(__FreeBSD__) || defined(__OpenBSD__)
 #include <gnome-keyring-1/gnome-keyring.h>
 
@@ -145,8 +144,9 @@ bool RsLoginHandler::tryAutoLogin(const RsPeerId& ssl_id,std::string& ssl_passwd
 
 	void *passwordData = NULL;
 	UInt32 passwordLength = 0;
-	const char *userId = ssl_id.c_str();
-	UInt32 uidLength = strlen(ssl_id.c_str());
+        std::string idtemp = ssl_id.toStdString();
+        const char *userId = idtemp.c_str();
+        UInt32 uidLength = strlen(userId);
 	SecKeychainItemRef itemRef = NULL;
 
 	OSStatus status = SecKeychainFindGenericPassword (
@@ -381,8 +381,9 @@ bool RsLoginHandler::enableAutoLogin(const RsPeerId& ssl_id,const std::string& s
 
 	const void *password = ssl_passwd.c_str();
 	UInt32 passwordLength = strlen(ssl_passwd.c_str());
-	const char *userid = ssl_id.c_str();
-	UInt32 uidLength = strlen(ssl_id.c_str());
+	std::string idtemp = ssl_id.toStdString();
+	const char *userid = idtemp.c_str();
+	UInt32 uidLength = strlen(userid);
 
 	OSStatus status = SecKeychainAddGenericPassword (
 			NULL,            // default keychain
@@ -540,8 +541,9 @@ bool RsLoginHandler::clearAutoLogin(const RsPeerId& ssl_id)
 
 	void *passwordData = NULL;
 	UInt32 passwordLength = 0;
-	const char *userId = ssl_id.c_str();
-	UInt32 uidLength = strlen(ssl_id.c_str());
+        std::string idtemp = ssl_id.toStdString();
+        const char *userId = idtemp.c_str();
+        UInt32 uidLength = strlen(userId);
 	SecKeychainItemRef itemRef = NULL;
 
 	OSStatus status = SecKeychainFindGenericPassword (
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index c2a513519..3a2adcae1 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -210,18 +210,18 @@ win32 {
 
 macx {
     # ENABLE THIS OPTION FOR Univeral Binary BUILD.
-    	CONFIG += ppc x86
-	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
+    	#CONFIG += ppc x86
+	#QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
 
 	CONFIG += version_detail_bash_script
         LIBS += -lssl -lcrypto -lz 
         #LIBS += -lssl -lcrypto -lz -lgpgme -lgpg-error -lassuan
-	LIBS += ../../../miniupnpc-1.0/libminiupnpc.a
+	LIBS += ../../../miniupnpc-1.3/libminiupnpc.a
 	LIBS += -framework CoreFoundation
 	LIBS += -framework Security
-
-	INCLUDEPATH += .
-	#DEFINES* = MAC_IDLE # for idle feature
+	LIBS += -framework Carbon
+	INCLUDEPATH += . /usr/local/include
+	DEFINES *= MAC_IDLE # for idle feature
 	CONFIG -= uitools
 }