--- xmlsecurity/source/xmlsec/nss/makefile.mk	2016/01/16 13:04:30	1724970
+++ xmlsecurity/source/xmlsec/nss/makefile.mk	2016/01/16 13:11:53	1724971
@@ -42,6 +42,10 @@
 	@echo "No nss -> no libxmlsec -> no xmlsecurity/nss"
 .ENDIF
 
+.IF "$(SYSTEM_NSS)" == "YES"
+CFLAGS+=-DSYSTEM_NSS
+.ENDIF
+
 .IF "$(SYSTEM_NSS)" != "YES"
 MOZ_INC = $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
 NSS_CFLAGS = -I$(MOZ_INC)$/nss
--- xmlsecurity/source/xmlsec/nss/nssinitializer.cxx	2016/01/16 13:04:30	1724970
+++ xmlsecurity/source/xmlsec/nss/nssinitializer.cxx	2016/01/16 13:11:53	1724971
@@ -234,7 +234,7 @@
 //the location of the roots module to the profile, which makes FF2 and TB2 use
 //it instead of there own module.
 //
-//When using SYSTEM_MOZILLA then the libnss3.so lib is typically found in
+//When using SYSTEM_NSS then the libnss3.so lib is typically found in
 ///usr/lib. This folder may, however, NOT contain the roots certificate
 //module. That is, just providing the library name in SECMOD_LoadUserModule or
 //SECMOD_AddNewModule will FAIL to load the mozilla unless the LD_LIBRARY_PATH
@@ -289,7 +289,7 @@
     out_nss_init = true;
     
 #ifdef XMLSEC_CRYPTO_NSS
-#if defined SYSTEM_MOZILLA
+#if defined SYSTEM_NSS
     if (!SECMOD_HasRootCerts())
     {
 #endif
@@ -298,7 +298,7 @@
 #if defined OS2
         // YD the nss system dlls names are ending with 'k'
         OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "nssckbik" SAL_DLLEXTENSION));
-#elif defined SYSTEM_MOZILLA
+#elif defined SYSTEM_NSS
         OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "libnssckbi" SAL_DLLEXTENSION));
 #else
         OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "${OOO_BASE_DIR}/program/libnssckbi" SAL_DLLEXTENSION));
@@ -352,7 +352,7 @@
             xmlsec_trace("Adding new root certificate module failed.");
             return_value = false;
         }
-#if SYSTEM_MOZILLA
+#if SYSTEM_NSS
     }
 #endif
 #endif
--- extensions/source/mozbootstrap/MNSProfileDiscover.cxx.orig	2016-01-19 09:06:50.753350000 +0100
+++ extensions/source/mozbootstrap/MNSProfileDiscover.cxx	2016-01-19 09:08:17.120488000 +0100
@@ -123,9 +123,14 @@
                     {
                         isRelative = sIsRelative.toInt32();
                     }
+                    if (isRelative)
+                    {
+                        // Make it absolute
+                        profilePath = regDir + profilePath;
+                    }
 
                     ProfileStruct*  profileItem     = new ProfileStruct(product,profileName,
-                            regDir + profilePath);
+                            profilePath);
                     m_Product.mProfileList[profileName] = profileItem;
 
                     sal_Int32 isDefault = 0;