diff --git a/ChangeLog b/ChangeLog
index fafc6ce4..865aea45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 20 21:05:27 CET 2005 Daniel Veillard <daniel@veillard.com>
+
+	* tests/plugins/Makefile.am tests/plugins/testplugin.c: applied
+	  patch 10 from Joel Reed
+
 Wed Jan 19 10:08:55 HKT 2005 William Brack <wbrack@mmm.com.hk>
 
 	* libxslt/xsltwin32config.h, libxslt/xsltwin32config.h.in:
diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am
index 82083fe3..cddafaa4 100644
--- a/tests/plugins/Makefile.am
+++ b/tests/plugins/Makefile.am
@@ -16,7 +16,7 @@ pkglib_LTLIBRARIES = xmlsoft_org_xslt_testplugin.la
 
 xmlsoft_org_xslt_testplugin_la_CFLAGS = -DMODULE_COMPILE $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
 xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c
-xmlsoft_org_xslt_testplugin_la_LDFLAGS = -module -avoid-version $(LIBXML_LIBS) $(LIBXSLT_LIBS)
+xmlsoft_org_xslt_testplugin_la_LDFLAGS = -module -avoid-version $(LIBXML_LIBS) $(XSLT_LIBS)
 
 test-logall:
 	@echo '## Running plugin tests'
diff --git a/tests/plugins/testplugin.c b/tests/plugins/testplugin.c
index f93943d7..eba609fc 100644
--- a/tests/plugins/testplugin.c
+++ b/tests/plugins/testplugin.c
@@ -311,7 +311,7 @@ xsltExtStyleShutdownTest(xsltStylesheetPtr style ATTRIBUTE_UNUSED,
  */
 
 void
-xmlsoft_org_xslt_testplugin_init(void)
+XSLTPUBFUN xmlsoft_org_xslt_testplugin_init(void)
 {
     xsltRegisterExtModuleFull((const xmlChar *) XSLT_TESTPLUGIN_URL,
                               xsltExtInitTest, xsltExtShutdownTest,