--- .\Makefile.mingw.orig	2012-09-04 16:26:23.000000000 +0100
+++ .\Makefile.mingw	2012-12-14 20:41:14.127589100 +0000
@@ -88,7 +88,8 @@
 	$(XSLT_INTDIR)/variables.o\
 	$(XSLT_INTDIR)/xslt.o\
 	$(XSLT_INTDIR)/xsltlocale.o\
-	$(XSLT_INTDIR)/xsltutils.o
+	$(XSLT_INTDIR)/xsltutils.o\
+	$(XSLT_INTDIR)/attrvt.o
 XSLT_SRCS = $(subst .o,.c,$(subst $(XSLT_INTDIR),$(XSLT_SRCDIR),$(XSLT_OBJS)))
 
 # Static libxslt object files.
@@ -109,7 +110,8 @@
 	$(XSLT_INTDIR_A)/variables.o\
 	$(XSLT_INTDIR_A)/xslt.o\
 	$(XSLT_INTDIR_A)/xsltlocale.o\
-	$(XSLT_INTDIR_A)/xsltutils.o
+	$(XSLT_INTDIR_A)/xsltutils.o\
+	$(XSLT_INTDIR_A)/attrvt.o
 
 # Libexslt object files.
 EXSLT_OBJS = $(EXSLT_INTDIR)/common.o\
@@ -233,7 +235,7 @@
 XSLTSO_LDFLAGS += -Wl,--major-image-version,$(LIBXSLT_MAJOR_VERSION)
 XSLTSO_LDFLAGS += -Wl,--minor-image-version,$(LIBXSLT_MINOR_VERSION)
 $(BINDIR)\$(XSLT_SO) : $(BINDIR) $(XSLT_OBJS) 
-	$(LD) $(XSLTSO_LDFLAGS) -o $(BINDIR)/$(XSLT_SO) $(XSLT_OBJS) $(LIBS) -llibxml2
+	$(LD) $(XSLTSO_LDFLAGS) -o $(BINDIR)/$(XSLT_SO) $(XSLT_OBJS) $(LIBS) -lxml2
 
 # Creates the libxslt archive.
 $(BINDIR)\$(XSLT_A) : $(BINDIR) $(XSLT_OBJS_A)
@@ -268,7 +270,7 @@
 EXSLTSO_LDFLAGS += -Wl,--major-image-version,$(LIBEXSLT_MAJOR_VERSION)
 EXSLTSO_LDFLAGS += -Wl,--minor-image-version,$(LIBEXSLT_MINOR_VERSION)
 $(BINDIR)\$(EXSLT_SO) : $(BINDIR) $(EXSLT_OBJS) libxslt
-	$(LD) $(EXSLTSO_LDFLAGS) -o $(BINDIR)/$(EXSLT_SO) $(EXSLT_OBJS) $(LIBS) -l$(XSLT_BASENAME) -llibxml2
+	$(LD) $(EXSLTSO_LDFLAGS) -o $(BINDIR)/$(EXSLT_SO) $(EXSLT_OBJS) $(LIBS) -l$(XSLT_NAME) -lxml2
 
 # Creates the libexslt archive.
 $(BINDIR)\$(EXSLT_A) : $(BINDIR) $(EXSLT_OBJS_A) libxslta
@@ -281,7 +283,7 @@
 
 # An implicit rule for xsltproc and friends.
 APPLIBS = $(LIBS)
-APPLIBS += -llibxml2 -l$(XSLT_BASENAME) -l$(EXSLT_BASENAME)
+APPLIBS += -l$(XSLT_NAME) -l$(EXSLT_NAME) -lxml2
 APP_LDFLAGS = $(LDFLAGS)
 APP_LDFLAGS += -Wl,--major-image-version,$(LIBXSLT_MAJOR_VERSION)
 APP_LDFLAGS += -Wl,--minor-image-version,$(LIBXSLT_MINOR_VERSION)