diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
index a7e296d4d..d5e9986a1 100644
--- a/libretroshare/src/libretroshare.pro
+++ b/libretroshare/src/libretroshare.pro
@@ -116,7 +116,6 @@ HEADERS += dbase/cachestrapper.h \
            pqi/authssl.h \
            pqi/authxpgp.h \
            pqi/cleanupxpgp.h \
-           pqi/gpgauthmgr.h \
            pqi/p3authmgr.h \
            pqi/p3cfgmgr.h \
            pqi/p3connmgr.h \
diff --git a/libretroshare/src/rsserver/p3face-startup.cc b/libretroshare/src/rsserver/p3face-startup.cc
index fc06d0fb0..4d9e69f90 100644
--- a/libretroshare/src/rsserver/p3face-startup.cc
+++ b/libretroshare/src/rsserver/p3face-startup.cc
@@ -1172,7 +1172,7 @@ bool RsInit::RsGenerateCertificate(
 
 /**************** PQI_USE_XPGP ******************/
 #if defined(PQI_USE_XPGP)
-	if (!generate_xpgp(cert_name.c_str(), key_name.c_str(),
+        if (generate_xpgp(cert_name.c_str(), key_name.c_str(),
 			password.c_str(),
 			name.c_str(),
 			"", //ui -> gen_email -> value(),
diff --git a/libretroshare/src/upnp/upnputil.c b/libretroshare/src/upnp/upnputil.c
index c10b202d6..6d20668dd 100644
--- a/libretroshare/src/upnp/upnputil.c
+++ b/libretroshare/src/upnp/upnputil.c
@@ -146,8 +146,9 @@ bool SetRedirectAndTest(struct UPNPUrls * urls,
 	r = UPNP_AddPortMapping(urls->controlURL, data->servicetype,
 	                        eport, iport, iaddr, 0, proto);
 #else
+        /* The lease parameter is also gone in minupnpc 1.0 */
 	r = UPNP_AddPortMapping(urls->controlURL, data->servicetype,
-	                        eport, iport, iaddr, 0, 0, proto);
+                                eport, iport, iaddr, 0, proto);
 #endif
 
 //	r = UPNP_AddPortMapping(urls->controlURL, data->servicetype,
diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro
index e91535319..6463ed7bf 100644
--- a/retroshare-gui/src/RetroShare.pro
+++ b/retroshare-gui/src/RetroShare.pro
@@ -64,7 +64,17 @@ macx {
 
 ############################## Common stuff ######################################
 
-LIBS += -lretroshare -lminiupnpc -lssl -lcrypto
+# On Linux systems that alredy have libssl and libcrypto it is advisable
+# to rename the patched version of SSL to something like libsslxpgp.a and libcryptoxpg.a
+
+# comment the next option if you renamed libcrtypto and libssl
+LIBS += -L"../../../../lib" -lretroshare -lminiupnpc -lssl -lcrypto
+
+# uncomment the next option if you renamed libcrtypto and libssl
+#LIBS += -L"../../../../lib" -lretroshare -lminiupnpc -lsslxpgp -lcryptoxpgp
+
+# ###########################################
+
 LIBS += -lz -lgpgme
 LIBS += -lQtUiTools