3 files changed, 11 insertions, 4 deletions
diff --git a/xmlsecurity/util/makefile.mk b/xmlsecurity/util/makefile.mk
index 75ef30c7c5ac..4f60f4babe0e 100644
--- a/xmlsecurity/util/makefile.mk
+++ b/xmlsecurity/util/makefile.mk
@@ -83,10 +83,10 @@ SHL2LIBS= \
 .IF "$(CRYPTO_ENGINE)" == "mscrypto"
 SHL2LIBS += \
     $(SLB)$/xs_mscrypt.lib
-.ELSE
+.ENDIF
+
 SHL2LIBS += \
     $(SLB)$/xs_nss.lib
-.ENDIF
 
 .ENDIF
 
@@ -117,19 +117,22 @@ SHL2STDLIBS += $(NSS_LIB)
 
 .IF "$(CRYPTO_ENGINE)" == "mscrypto"
 SHL2STDLIBS+= $(MSCRYPTOLIBS)
+# SHL2STDLIBS+= $(XMLSECLIB) $(LIBXML2LIB) $(NSS3LIB) $(NSPR4LIB) $(PLC4LIB)
+SHL2STDLIBS+= $(NSS3LIB) $(NSPR4LIB)
 .ELSE
 SHL2STDLIBS+= $(NSSCRYPTOLIBS)
 .ENDIF
 
+
 SHL2IMPLIB = $(SHL2TARGET)
 SHL2DEF = $(MISC)$/$(SHL2TARGET).def
 DEF2NAME = $(SHL2TARGET)
 .IF "$(CRYPTO_ENGINE)" == "mscrypto"
 DEF2EXPORTFILE = exports_xsmscrypt.dxp
-.ELSE
-DEF2EXPORTFILE = exports_xsnss.dxp
 .ENDIF
 
+DEF2EXPORTFILE = exports_xsnss.dxp
+
 SRSFILELIST=	\
                 $(SRS)$/component.srs   \
                 $(SRS)$/dialogs.srs
diff --git a/xmlsecurity/util/xsec_xmlsec.component b/xmlsecurity/util/xsec_xmlsec.component
index de991899f026..df4c2a7b26ee 100644
--- a/xmlsecurity/util/xsec_xmlsec.component
+++ b/xmlsecurity/util/xsec_xmlsec.component
@@ -32,6 +32,7 @@
     <service name="com.sun.star.security.SerialNumberAdapter"/>
   </implementation>
   <implementation name="com.sun.star.xml.security.bridge.xmlsec.SEInitializer_NssImpl">
+    <service name="com.sun.star.xml.crypto.NSSInitializer"/>
     <service name="com.sun.star.xml.crypto.SEInitializer"/>
   </implementation>
   <implementation name="com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl">
diff --git a/xmlsecurity/util/xsec_xmlsec.windows.component b/xmlsecurity/util/xsec_xmlsec.windows.component
index fb11cc6e9d36..7b4ef87a9480 100644
--- a/xmlsecurity/util/xsec_xmlsec.windows.component
+++ b/xmlsecurity/util/xsec_xmlsec.windows.component
@@ -31,6 +31,9 @@
   <implementation name="com.sun.star.security.SerialNumberAdapter">
     <service name="com.sun.star.security.SerialNumberAdapter"/>
   </implementation>
+  <implementation name="com.sun.star.xml.security.bridge.xmlsec.NSSInitializer_NssImpl">
+    <service name="com.sun.star.xml.crypto.NSSInitializer"/>
+  </implementation>
   <implementation name="com.sun.star.xml.security.bridge.xmlsec.SEInitializer_MSCryptImpl">
     <service name="com.sun.star.xml.crypto.SEInitializer"/>
   </implementation>