diff --git a/ChangeLog b/ChangeLog
index 9b641aa3..c2ab0735 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 11 08:44:01 CEST 2001 Daniel Veillard <daniel@veillard.com>
+
+	* win32/Makefile.mingw: update from Tobias Peters for 2.4.5
+	* DOCBparser.c: generate line nubers in elements
+
 Wed Oct 10 11:35:45 CEST 2001 Daniel Veillard <daniel@veillard.com>
 
 	* configure.in: preparing 2.4.6 release
diff --git a/DOCBparser.c b/DOCBparser.c
index 3983c5a0..b8809fc1 100644
--- a/DOCBparser.c
+++ b/DOCBparser.c
@@ -5029,6 +5029,7 @@ docbInitParserCtxt(docbParserCtxtPtr ctxt)
     ctxt->userData = ctxt;
     ctxt->myDoc = NULL;
     ctxt->wellFormed = 1;
+    ctxt->linenumbers = 1;
     ctxt->replaceEntities = xmlSubstituteEntitiesDefaultValue;
     ctxt->html = 2;
     ctxt->record_info = 0;
diff --git a/win32/Makefile.mingw b/win32/Makefile.mingw
index 3e518ef7..7c4571a2 100644
--- a/win32/Makefile.mingw
+++ b/win32/Makefile.mingw
@@ -2,40 +2,28 @@
 # DLL-import library, and the test executables using the "mingw" gcc
 # compiler environment.  This Makefile is based on Alfred Reibenschuh's
 # version for 2.1.1, and was modified by Wayne Davison.
+# Modified 2001/10/10 Tobias Peters for libxml2-2.4.5
 
 # Set "PREFIX" to the root of the mingw installed files.
 
 PREFIX = /mingw
 
-CC=gcc
-CFLAGS=-O -Iinclude -I$(PREFIX)/include -D_WINSOCKAPI_ -fnative-struct
-LDFLAGS=-L. -L$(PREFIX)/lib
-LIBS=-lwsock32 -lz
+CC       = gcc
+CFLAGS   = -Iinclude -fnative-struct -D_WINSOCKAPI_ \
+           -Dsnprintf=_snprintf -Dvsnprintf=_vsnprintf
+LDFLAGS  = -L. -L$(PREFIX)/lib
+LIBS     = -lwsock32 -lz
 
 AR=ar rc
 DLLTOOL=dlltool
 DLLWRAP=dllwrap
 
-LIBSRCS=HTMLparser.c	\
-	HTMLtree.c	\
-	SAX.c		\
-	debugXML.c	\
-	encoding.c	\
-	entities.c	\
-	error.c		\
-	nanoftp.c	\
-	nanohttp.c	\
-	parser.c	\
-	parserInternals.c	\
-	tree.c		\
-	valid.c		\
-	xlink.c		\
-	xmlIO.c		\
-	xmlmemory.c	\
-	xpath.c		\
-	xpointer.c	\
-	hash.c		\
-	uri.c
+
+LIBSRCS=SAX.c entities.c encoding.c error.c parserInternals.c  \
+		parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c  \
+		valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c  \
+		xpointer.c xinclude.c nanohttp.c nanoftp.c DOCBparser.c \
+		catalog.c strio.c
 
 LIBOBJS=$(LIBSRCS:.c=.o)
 
@@ -55,6 +43,8 @@ EXE3=$(OBJ3:.o=.exe)
 IMPBASE=$(LIBBASE)_dll
 IMP=lib$(IMPBASE).a
 
+DLLFLAGS = --shared -o $(DLL) -Wl,--out-implib,$(IMP)
+
 DEF=$(DLL:.dll=.def)
 
 all: $(LIB) $(DLL) $(DEF) $(IMP) $(EXE1) $(EXE2) $(EXE3)
@@ -63,8 +53,9 @@ dll: $(DLL)
 
 lib: $(LIB)
 
-$(DLL): $(LIB) $(DEF) $(IMP)
-	$(DLLWRAP) --def $(DEF) --dllname $@ --output-lib $@ $(LIB) $(LDFLAGS) $(LIBS) -mwindows
+$(DLL) $(IMP): $(LIBOBJS)
+	$(CC) $(DLLFLAGS) $(LIBOBJS) $(LDFLAGS) $(LIBS)
+# -mwindows
 
 $(LIB): $(LIBOBJS)
 	$(AR) $@ $^
@@ -72,23 +63,29 @@ $(LIB): $(LIBOBJS)
 $(DEF): $(LIBOBJS)
 	$(DLLTOOL) --kill-at --export-all -D $(DLL) --output-def $@ $^
 
-$(IMP): $(DEF)
-	$(DLLTOOL) -d $< -l $@ -D $(DLL)
-
-$(EXE1): $(OBJ1) $(LIBOBJS) $(DLL)
+$(EXE1): $(OBJ1) $(DLL)
 	$(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) -l$(IMPBASE) $(LIBS)
 	strip $@
 
-$(EXE2): $(OBJ2) $(LIBOBJS) $(DLL)
+$(EXE2): $(OBJ2) $(DLL)
 	$(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) -l$(IMPBASE) $(LIBS)
 	strip $@
 
-$(EXE3): $(OBJ3) $(LIBOBJS) $(LIB)
+$(EXE3): $(OBJ3) $(LIB)
 	$(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) -l$(LIBBASE) $(LIBS)
 	strip $@
 
+$(OBJ1): $(OBJ1:.o=.c)
+	$(CC) $(CFLAGS) -DLIBXML_DLL_IMPORT=__declspec'(dllimport)' -c $< -o $@
+
+$(OBJ2): $(OBJ2:.o=.c)
+	$(CC) $(CFLAGS) -DLIBXML_DLL_IMPORT=__declspec'(dllimport)' -c $< -o $@
+
+$(OBJ3): $(OBJ3:.o=.c)
+	$(CC) $(CFLAGS) -c $< -o $@
+
 .c.o:
-	$(CC) $(CFLAGS) -c $< -o $@	
+	$(CC) $(CFLAGS) -DIN_LIBXML -c $< -o $@	
 
 clean:
 	rm *.o *.a *.dll *.def