diff --git a/Makefile.am b/Makefile.am
index c7f140c..967afbd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -159,7 +159,7 @@ testModule_LDADD= $(LDADDS)
 
 noinst_LTLIBRARIES = testdso.la
 testdso_la_SOURCES = testdso.c
-testdso_la_LDFLAGS = -module -rpath $(libdir)
+testdso_la_LDFLAGS = -module -no-undefined -avoid-version -rpath $(libdir)
 
 # that one forces the rebuild when "make rebuild" is run on doc/
 rebuild_testapi:
diff --git a/config.h.in b/config.h.in
index 6f45c6c..d60f362 100644
--- a/config.h.in
+++ b/config.h.in
@@ -274,6 +274,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
diff --git a/configure.in b/configure.in
index 3e4a601..5c9ffbd 100644
--- a/configure.in
+++ b/configure.in
@@ -779,6 +779,10 @@ if test "$with_modules" != "no" ; then
     AC_DEFINE([HAVE_DLOPEN], [], [Have dlopen based dso])
   ])
   ;;
+  *-*-mingw*)
+  MODULE_EXTENSION=".dll"
+  WITH_MODULES=1
+  ;;
   *)
   AC_CHECK_FUNC(shl_load, libxml_have_shl_load=yes, [
     AC_CHECK_LIB(dld, shl_load, [
diff --git a/include/libxml/xmlexports.h b/include/libxml/xmlexports.h
index b90659f..9c6790c 100644
--- a/include/libxml/xmlexports.h
+++ b/include/libxml/xmlexports.h
@@ -113,7 +113,7 @@
    * _imp__xmlFree listed as missing. Try to workaround the problem
    * by also making that declaration when compiling client code.
    */
-  #if !defined(LIBXML_STATIC)
+  #if defined(IN_LIBXML) && !defined(LIBXML_STATIC)
     #define XMLPUBFUN __declspec(dllexport)
     #define XMLPUBVAR __declspec(dllexport)
   #else
diff --git a/libxml.h b/libxml.h
index 3c44c83..1656ac2 100644
--- a/libxml.h
+++ b/libxml.h
@@ -90,4 +90,7 @@ void __xmlGlobalInitMutexDestroy(void);
 #endif
 #endif
 #endif
+#ifndef PIC
+#  define LIBXML_STATIC
+#endif
 #endif /* ! __XML_LIBXML_H__ */