diff --git a/AUTHORS b/AUTHORS
index 77858fc..cf2e9a6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,5 @@
 Daniel Veillard <daniel@veillard.com>
 Bjorn Reese <breese@users.sourceforge.net>
 William Brack <wbrack@mmm.com.hk>
-Igor Zlatkovic <igor@stud.fh-frankfurt.de> for the Windows port
+Igor Zlatkovic <igor@zlatkovic.com> for the Windows port
 Aleksey Sanin <aleksey@aleksey.com>
diff --git a/ChangeLog b/ChangeLog
index 5353d4b..75ca7ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Dec 18 15:51:22 CET 2002 Daniel Veillard <daniel@veillard.com>
+
+	* xmlreader.c include/libxml/xmlreader.h doc/libxml2-api.xml: more
+	  work on the xml reader interfaces.
+	* AUTHORS MAINTAINERS doc/* win32/*: updated Igor's mail and the
+	  Web page for the Windows binaries.
+
 Tue Dec 17 19:31:07 CET 2002 Daniel Veillard <daniel@veillard.com>
 
 	* xmlIO.c: applied a patch for VMS following the report by
diff --git a/MAINTAINERS b/MAINTAINERS
index 27adc1e..1f1a502 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1 +1,3 @@
-Email: Daniel.Veillard@imag.fr
+See first http://xmlsoft.org/bugs.html and use the list please.
+Email: daniel@redhat.com
+Windows port: igor@zlatkovic.com
diff --git a/doc/APIchunk0.html b/doc/APIchunk0.html
index da3be23..d2dbec0 100644
--- a/doc/APIchunk0.html
+++ b/doc/APIchunk0.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk1.html b/doc/APIchunk1.html
index 756e6a8..7db41b9 100644
--- a/doc/APIchunk1.html
+++ b/doc/APIchunk1.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk10.html b/doc/APIchunk10.html
index b9c8b2d..f6c86fc 100644
--- a/doc/APIchunk10.html
+++ b/doc/APIchunk10.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk11.html b/doc/APIchunk11.html
index 71c470a..10fa0a0 100644
--- a/doc/APIchunk11.html
+++ b/doc/APIchunk11.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk12.html b/doc/APIchunk12.html
index 3fe8e05..085c7e9 100644
--- a/doc/APIchunk12.html
+++ b/doc/APIchunk12.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk13.html b/doc/APIchunk13.html
index ffdf4f0..828f580 100644
--- a/doc/APIchunk13.html
+++ b/doc/APIchunk13.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk14.html b/doc/APIchunk14.html
index 1875c1c..371ed5a 100644
--- a/doc/APIchunk14.html
+++ b/doc/APIchunk14.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk15.html b/doc/APIchunk15.html
index faa3a08..ca924b2 100644
--- a/doc/APIchunk15.html
+++ b/doc/APIchunk15.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk16.html b/doc/APIchunk16.html
index 6cc9a0c..7e111a6 100644
--- a/doc/APIchunk16.html
+++ b/doc/APIchunk16.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk17.html b/doc/APIchunk17.html
index fd60f18..a082bbf 100644
--- a/doc/APIchunk17.html
+++ b/doc/APIchunk17.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk18.html b/doc/APIchunk18.html
index 1b672d1..5c5d3c5 100644
--- a/doc/APIchunk18.html
+++ b/doc/APIchunk18.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk19.html b/doc/APIchunk19.html
index 4d5597e..eeb64f7 100644
--- a/doc/APIchunk19.html
+++ b/doc/APIchunk19.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk2.html b/doc/APIchunk2.html
index b6438be..d2204c9 100644
--- a/doc/APIchunk2.html
+++ b/doc/APIchunk2.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk20.html b/doc/APIchunk20.html
index 6abd986..dc0fe0d 100644
--- a/doc/APIchunk20.html
+++ b/doc/APIchunk20.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk21.html b/doc/APIchunk21.html
index ace2585..2fcbd26 100644
--- a/doc/APIchunk21.html
+++ b/doc/APIchunk21.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk22.html b/doc/APIchunk22.html
index b7a23e2..f3ebb33 100644
--- a/doc/APIchunk22.html
+++ b/doc/APIchunk22.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk23.html b/doc/APIchunk23.html
index f353c16..b2e422d 100644
--- a/doc/APIchunk23.html
+++ b/doc/APIchunk23.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk24.html b/doc/APIchunk24.html
index 290517c..b74f93c 100644
--- a/doc/APIchunk24.html
+++ b/doc/APIchunk24.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk3.html b/doc/APIchunk3.html
index e6e2d2f..69d093d 100644
--- a/doc/APIchunk3.html
+++ b/doc/APIchunk3.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk4.html b/doc/APIchunk4.html
index 8a6801d..b883e6d 100644
--- a/doc/APIchunk4.html
+++ b/doc/APIchunk4.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk5.html b/doc/APIchunk5.html
index c241f9d..876c89e 100644
--- a/doc/APIchunk5.html
+++ b/doc/APIchunk5.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk6.html b/doc/APIchunk6.html
index a98e6c3..3449322 100644
--- a/doc/APIchunk6.html
+++ b/doc/APIchunk6.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk7.html b/doc/APIchunk7.html
index f7eb51d..51a67d8 100644
--- a/doc/APIchunk7.html
+++ b/doc/APIchunk7.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk8.html b/doc/APIchunk8.html
index 744abf9..5b8ecbb 100644
--- a/doc/APIchunk8.html
+++ b/doc/APIchunk8.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIchunk9.html b/doc/APIchunk9.html
index 7190359..34017fb 100644
--- a/doc/APIchunk9.html
+++ b/doc/APIchunk9.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIconstructors.html b/doc/APIconstructors.html
index 838bcc5..7077ea5 100644
--- a/doc/APIconstructors.html
+++ b/doc/APIconstructors.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIfiles.html b/doc/APIfiles.html
index 209d611..0610669 100644
--- a/doc/APIfiles.html
+++ b/doc/APIfiles.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIfunctions.html b/doc/APIfunctions.html
index d2a3b7b..2f0f5b4 100644
--- a/doc/APIfunctions.html
+++ b/doc/APIfunctions.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/APIsymbols.html b/doc/APIsymbols.html
index c821d1e..d065184 100644
--- a/doc/APIsymbols.html
+++ b/doc/APIsymbols.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/DOM.html b/doc/DOM.html
index 285c8e8..c56886d 100644
--- a/doc/DOM.html
+++ b/doc/DOM.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/FAQ.html b/doc/FAQ.html
index 63ac2a2..c1a6a91 100644
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/XMLinfo.html b/doc/XMLinfo.html
index 994a052..a1e799b 100644
--- a/doc/XMLinfo.html
+++ b/doc/XMLinfo.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/XSLT.html b/doc/XSLT.html
index f1b70f1..f9d491e 100644
--- a/doc/XSLT.html
+++ b/doc/XSLT.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/architecture.html b/doc/architecture.html
index 462c615..9d3328f 100644
--- a/doc/architecture.html
+++ b/doc/architecture.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/bugs.html b/doc/bugs.html
index d18ca27..5026d56 100644
--- a/doc/bugs.html
+++ b/doc/bugs.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/catalog.html b/doc/catalog.html
index 49098df..a5ff2ba 100644
--- a/doc/catalog.html
+++ b/doc/catalog.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/contribs.html b/doc/contribs.html
index 20b6721..a4010a1 100644
--- a/doc/contribs.html
+++ b/doc/contribs.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
@@ -99,8 +99,8 @@
     and Solaris port.</li>
   <li>John Fleck helps maintaining the documentation and man pages.</li>
   <li>
-<a href="mailto:igor@stud.fh-frankfurt.de">Igor  Zlatkovic</a> is now
-    the maintainer of the Windows port, <a href="http://www.fh-frankfurt.de/~igor/projects/libxml/index.html">he
+<a href="mailto:igor@zlatkovic.com">Igor  Zlatkovic</a> is now
+    the maintainer of the Windows port, <a href="http://ww.zlatkovic.com/projects/libxml/index.html">he
     provides binaries</a>
 </li>
   <li>
diff --git a/doc/docs.html b/doc/docs.html
index 4661a6b..56b462c 100644
--- a/doc/docs.html
+++ b/doc/docs.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/downloads.html b/doc/downloads.html
index 9483f2a..9384ba3 100644
--- a/doc/downloads.html
+++ b/doc/downloads.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
@@ -98,8 +98,8 @@
 archive</a>
  , Antonin Sprinzl also provide <a href="ftp://gd.tuwien.ac.at/pub/libxml/">a
 mirror in Austria</a>. (NOTE that you need both the <a href="http://rpmfind.net/linux/RPM/libxml2.html">libxml(2)</a> and <a href="http://rpmfind.net/linux/RPM/libxml2-devel.html">libxml(2)-devel</a>
-packages installed to compile applications using libxml.) <a href="mailto:igor@stud.fh-frankfurt.de">Igor  Zlatkovic</a> is now the
-maintainer of the Windows port, <a href="http://www.fh-frankfurt.de/~igor/projects/libxml/index.html">he
+packages installed to compile applications using libxml.) <a href="mailto:igor@zlatkovic.com">Igor  Zlatkovic</a> is now the
+maintainer of the Windows port, <a href="http://ww.zlatkovic.com/projects/libxml/index.html">he
 provides binaries</a>. <a href="mailto:Gary.Pennington@sun.com">Gary
 Pennington</a> provides <a href="http://garypennington.net/libxml2/">Solaris
 binaries</a>. <a href="mailto:Steve.Ball@zveno.com">Steve Ball</a> provides
diff --git a/doc/encoding.html b/doc/encoding.html
index 85d1c74..d644c3b 100644
--- a/doc/encoding.html
+++ b/doc/encoding.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/entities.html b/doc/entities.html
index b884e18..7656182 100644
--- a/doc/entities.html
+++ b/doc/entities.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/example.html b/doc/example.html
index 168c0d9..a7a801c 100644
--- a/doc/example.html
+++ b/doc/example.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/help.html b/doc/help.html
index 53b665c..776247b 100644
--- a/doc/help.html
+++ b/doc/help.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/index.html b/doc/index.html
index 2037c26..c52c903 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/interface.html b/doc/interface.html
index 738dd28..fb868ba 100644
--- a/doc/interface.html
+++ b/doc/interface.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/intro.html b/doc/intro.html
index 1d2c55c..81411c7 100644
--- a/doc/intro.html
+++ b/doc/intro.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/library.html b/doc/library.html
index d416676..e41d3e3 100644
--- a/doc/library.html
+++ b/doc/library.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index ce8479c..dbbf347 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -1087,9 +1087,13 @@
      <exports symbol='xmlSubstituteEntitiesDefaultValue'/>
     </file>
     <file name='xmlreader'>
+     <exports symbol='XML_PARSER_DEFAULTATTRS'/>
+     <exports symbol='XML_PARSER_LOADDTD'/>
+     <exports symbol='XML_PARSER_VALIDATE'/>
      <exports symbol='xmlFreeTextReader'/>
      <exports symbol='xmlNewTextReader'/>
      <exports symbol='xmlNewTextReaderFilename'/>
+     <exports symbol='xmlParserProperties'/>
      <exports symbol='xmlTextReader'/>
      <exports symbol='xmlTextReaderAttributeCount'/>
      <exports symbol='xmlTextReaderBaseUri'/>
@@ -1098,6 +1102,7 @@
      <exports symbol='xmlTextReaderGetAttribute'/>
      <exports symbol='xmlTextReaderGetAttributeNo'/>
      <exports symbol='xmlTextReaderGetAttributeNs'/>
+     <exports symbol='xmlTextReaderGetParserProp'/>
      <exports symbol='xmlTextReaderGetRemainder'/>
      <exports symbol='xmlTextReaderHasAttributes'/>
      <exports symbol='xmlTextReaderHasValue'/>
@@ -1119,10 +1124,12 @@
      <exports symbol='xmlTextReaderPtr'/>
      <exports symbol='xmlTextReaderQuoteChar'/>
      <exports symbol='xmlTextReaderRead'/>
+     <exports symbol='xmlTextReaderReadAttributeValue'/>
      <exports symbol='xmlTextReaderReadInnerXml'/>
      <exports symbol='xmlTextReaderReadOuterXml'/>
      <exports symbol='xmlTextReaderReadState'/>
      <exports symbol='xmlTextReaderReadString'/>
+     <exports symbol='xmlTextReaderSetParserProp'/>
      <exports symbol='xmlTextReaderValue'/>
      <exports symbol='xmlTextReaderXmlLang'/>
     </file>
@@ -2357,6 +2364,7 @@
     <enum name='XML_PARSER_CDATA_SECTION' file='parser' value='8' type='xmlParserInputState' info='within a CDATA section'/>
     <enum name='XML_PARSER_COMMENT' file='parser' value='5' type='xmlParserInputState' info='within a comment'/>
     <enum name='XML_PARSER_CONTENT' file='parser' value='7' type='xmlParserInputState' info='within the content'/>
+    <enum name='XML_PARSER_DEFAULTATTRS' file='xmlreader' value='2' type='xmlParserProperties'/>
     <enum name='XML_PARSER_DTD' file='parser' value='3' type='xmlParserInputState' info='within some DTD content'/>
     <enum name='XML_PARSER_END_TAG' file='parser' value='9' type='xmlParserInputState' info='within a closing tag'/>
     <enum name='XML_PARSER_ENTITY_DECL' file='parser' value='10' type='xmlParserInputState' info='within an entity declaration'/>
@@ -2364,6 +2372,7 @@
     <enum name='XML_PARSER_EOF' file='parser' value='-1' type='xmlParserInputState' info='nothing is to be parsed'/>
     <enum name='XML_PARSER_EPILOG' file='parser' value='14' type='xmlParserInputState' info='the Misc* after the last end tag'/>
     <enum name='XML_PARSER_IGNORE' file='parser' value='15' type='xmlParserInputState' info='within an IGNORED section'/>
+    <enum name='XML_PARSER_LOADDTD' file='xmlreader' value='1' type='xmlParserProperties'/>
     <enum name='XML_PARSER_MISC' file='parser' value='1' type='xmlParserInputState' info='Misc* before int subset'/>
     <enum name='XML_PARSER_PI' file='parser' value='2' type='xmlParserInputState' info='Within a processing instruction'/>
     <enum name='XML_PARSER_PROLOG' file='parser' value='4' type='xmlParserInputState' info='Misc* after internal subset'/>
@@ -2371,6 +2380,7 @@
     <enum name='XML_PARSER_START' file='parser' value='0' type='xmlParserInputState' info='nothing has been parsed'/>
     <enum name='XML_PARSER_START_TAG' file='parser' value='6' type='xmlParserInputState' info='within a start tag'/>
     <enum name='XML_PARSER_SYSTEM_LITERAL' file='parser' value='13' type='xmlParserInputState' info='within a SYSTEM value'/>
+    <enum name='XML_PARSER_VALIDATE' file='xmlreader' value='3' type='xmlParserProperties'/>
     <enum name='XML_PI_NODE' file='tree' value='7' type='xmlElementType'/>
     <enum name='XML_TEXT_NODE' file='tree' value='3' type='xmlElementType'/>
     <enum name='XML_WAR_CATALOG_PI' file='xmlerror' value='93' type='xmlParserErrors' info='93'/>
@@ -2826,6 +2836,7 @@
       <field name='buffer' type='xmlParserNodeInfo *' info=''/>
     </struct>
     <typedef name='xmlParserNodeInfoSeqPtr' file='parser' type='xmlParserNodeInfoSeq *'/>
+    <typedef name='xmlParserProperties' file='xmlreader' type='enum'/>
     <struct name='xmlRMutex' file='threads' type='struct _xmlRMutex'/>
     <typedef name='xmlRMutexPtr' file='threads' type='xmlRMutex *'/>
     <struct name='xmlRef' file='tree' type='struct _xmlRef'>
@@ -7922,6 +7933,12 @@
       <arg name='localName' type='const xmlChar *' info='the local name of the attribute.'/>
       <arg name='namespaceURI' type='const xmlChar *' info='the namespace URI of the attribute.'/>
     </function>
+    <function name='xmlTextReaderGetParserProp' file='xmlreader'>
+      <info>Read the parser internal property.</info>
+      <return type='int' info='the value, usually 0 or 1, or -1 in case of error.'/>
+      <arg name='reader' type='xmlTextReaderPtr' info='the xmlTextReaderPtr used'/>
+      <arg name='prop' type='int' info='the xmlParserProperties to get'/>
+    </function>
     <function name='xmlTextReaderGetRemainder' file='xmlreader'>
       <info>Method to get the remainder of the buffered XML. this method stops the parser, set its state to End Of File and return the input stream with what is left that the parser did not use.</info>
       <return type='xmlParserInputBufferPtr' info='the xmlParserInputBufferPtr attached to the XML or NULL in case of error.'/>
@@ -8027,6 +8044,11 @@
       <return type='int' info='1 if the node was read successfully, 0 if there is no more nodes to read, or -1 in case of error'/>
       <arg name='reader' type='xmlTextReaderPtr' info='the xmlTextReaderPtr used'/>
     </function>
+    <function name='xmlTextReaderReadAttributeValue' file='xmlreader'>
+      <info>Parses an attribute value into one or more Text and EntityReference nodes.</info>
+      <return type='int' info='1 in case of success, 0 if the reader was not positionned on an ttribute node or all the attribute values have been read, or -1 in case of error.'/>
+      <arg name='reader' type='xmlTextReaderPtr' info='the xmlTextReaderPtr used'/>
+    </function>
     <function name='xmlTextReaderReadInnerXml' file='xmlreader'>
       <info>Reads the contents of the current node, including child nodes and markup.</info>
       <return type='xmlChar *' info='a string containing the XML content, or NULL if the current node is neither an element nor attribute, or has no child nodes. The string must be deallocated by the caller.'/>
@@ -8047,6 +8069,13 @@
       <return type='xmlChar *' info='a string containing the contents of the Element or Text node, or NULL if the reader is positioned on any other type of node. The string must be deallocated by the caller.'/>
       <arg name='reader' type='xmlTextReaderPtr' info='the xmlTextReaderPtr used'/>
     </function>
+    <function name='xmlTextReaderSetParserProp' file='xmlreader'>
+      <info>Change the parser processing behaviour by changing some of its internal properties. Note that some properties can only be changed before any read has been done.</info>
+      <return type='int' info='0 if the call was successful, or -1 in case of error'/>
+      <arg name='reader' type='xmlTextReaderPtr' info='the xmlTextReaderPtr used'/>
+      <arg name='prop' type='int' info='the xmlParserProperties to set'/>
+      <arg name='value' type='int' info='usually 0 or 1 to (de)activate it'/>
+    </function>
     <function name='xmlTextReaderValue' file='xmlreader'>
       <info>Provides the text value of the node if present</info>
       <return type='xmlChar *' info='the string or NULL if not available. The retsult must be deallocated with xmlFree()'/>
diff --git a/doc/namespaces.html b/doc/namespaces.html
index 46c2e37..9d2778e 100644
--- a/doc/namespaces.html
+++ b/doc/namespaces.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/news.html b/doc/news.html
index ec05639..be256e2 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/python.html b/doc/python.html
index 83bfde2..6855a08 100644
--- a/doc/python.html
+++ b/doc/python.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/search.php b/doc/search.php
index d5024ba..d321cb4 100644
--- a/doc/search.php
+++ b/doc/search.php
@@ -79,7 +79,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/site.xsl b/doc/site.xsl
index 7ed6688..942c877 100644
--- a/doc/site.xsl
+++ b/doc/site.xsl
@@ -153,7 +153,7 @@
       <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
       <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
       <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-      <li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+      <li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
       <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
       <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
       <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/threads.html b/doc/threads.html
index 3cfae90..e21cf76 100644
--- a/doc/threads.html
+++ b/doc/threads.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/tree.html b/doc/tree.html
index 66cf0d4..ccd9975 100644
--- a/doc/tree.html
+++ b/doc/tree.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 13fd669..c5df678 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/xml.html b/doc/xml.html
index 1cf3b32..9514fed 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -541,9 +541,9 @@
 href="http://rpmfind.net/linux/RPM/libxml2.html">libxml(2)</a> and <a
 href="http://rpmfind.net/linux/RPM/libxml2-devel.html">libxml(2)-devel</a>
 packages installed to compile applications using libxml.) <a
-href="mailto:igor@stud.fh-frankfurt.de">Igor  Zlatkovic</a> is now the
+href="mailto:igor@zlatkovic.com">Igor  Zlatkovic</a> is now the
 maintainer of the Windows port, <a
-href="http://www.fh-frankfurt.de/~igor/projects/libxml/index.html">he
+href="http://ww.zlatkovic.com/projects/libxml/index.html">he
 provides binaries</a>. <a href="mailto:Gary.Pennington@sun.com">Gary
 Pennington</a> provides <a href="http://garypennington.net/libxml2/">Solaris
 binaries</a>. <a href="mailto:Steve.Ball@zveno.com">Steve Ball</a> provides
@@ -3900,9 +3900,9 @@
     patches, Gary Pennington worked on the validation API, threading support
     and Solaris port.</li>
   <li>John Fleck helps maintaining the documentation and man pages.</li>
-  <li><a href="mailto:igor@stud.fh-frankfurt.de">Igor  Zlatkovic</a> is now
+  <li><a href="mailto:igor@zlatkovic.com">Igor  Zlatkovic</a> is now
     the maintainer of the Windows port, <a
-    href="http://www.fh-frankfurt.de/~igor/projects/libxml/index.html">he
+    href="http://ww.zlatkovic.com/projects/libxml/index.html">he
     provides binaries</a></li>
   <li><a href="mailto:Gary.Pennington@sun.com">Gary Pennington</a> provides
     <a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
diff --git a/doc/xmldtd.html b/doc/xmldtd.html
index 84a11c6..d24665f 100644
--- a/doc/xmldtd.html
+++ b/doc/xmldtd.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/xmlio.html b/doc/xmlio.html
index 196ba00..87e3d83 100644
--- a/doc/xmlio.html
+++ b/doc/xmlio.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/doc/xmlmem.html b/doc/xmlmem.html
index 7fb6ce8..03d8b05 100644
--- a/doc/xmlmem.html
+++ b/doc/xmlmem.html
@@ -84,7 +84,7 @@
 <li><a href="http://phd.cs.unibo.it/gdome2/">DOM gdome2</a></li>
 <li><a href="http://www.aleksey.com/xmlsec/">XML-DSig xmlsec</a></li>
 <li><a href="ftp://xmlsoft.org/">FTP</a></li>
-<li><a href="http://www.fh-frankfurt.de/~igor/projects/libxml/">Windows binaries</a></li>
+<li><a href="http://ww.zlatkovic.com/projects/libxml/">Windows binaries</a></li>
 <li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li>
 <li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li>
 <li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li>
diff --git a/include/libxml/xmlreader.h b/include/libxml/xmlreader.h
index 0acd61b..27c8ba3 100644
--- a/include/libxml/xmlreader.h
+++ b/include/libxml/xmlreader.h
@@ -16,6 +16,12 @@
 extern "C" {
 #endif
 
+typedef enum {
+    XML_PARSER_LOADDTD = 1,
+    XML_PARSER_DEFAULTATTRS,
+    XML_PARSER_VALIDATE
+} xmlParserProperties;
+
 typedef struct _xmlTextReader xmlTextReader;
 typedef xmlTextReader *xmlTextReaderPtr;
 
@@ -33,6 +39,7 @@
 xmlChar *	xmlTextReaderReadInnerXml	(xmlTextReaderPtr reader);
 xmlChar *	xmlTextReaderReadOuterXml	(xmlTextReaderPtr reader);
 xmlChar *	xmlTextReaderReadString		(xmlTextReaderPtr reader);
+int		xmlTextReaderReadAttributeValue	(xmlTextReaderPtr reader);
 
 /*
  * Attributes of the node
@@ -80,6 +87,14 @@
 int		xmlTextReaderMoveToElement	(xmlTextReaderPtr reader);
 int		xmlTextReaderNormalization	(xmlTextReaderPtr reader);
 
+/*
+ * Extensions
+ */
+int		xmlTextReaderSetParserProp	(xmlTextReaderPtr reader,
+						 int prop,
+						 int value);
+int		xmlTextReaderGetParserProp	(xmlTextReaderPtr reader,
+						 int prop);
 #ifdef __cplusplus
 }
 #endif
diff --git a/python/libxml2class.txt b/python/libxml2class.txt
index 10155f6..38a8a64 100644
--- a/python/libxml2class.txt
+++ b/python/libxml2class.txt
@@ -570,6 +570,7 @@
     getAttribute()
     getAttributeNo()
     getAttributeNs()
+    getParserProp()
     getRemainder()
     hasAttributes()
     hasValue()
@@ -590,10 +591,12 @@
     prefix()
     quoteChar()
     read()
+    readAttributeValue()
     readInnerXml()
     readOuterXml()
     readState()
     readString()
+    setParserProp()
     value()
     xmlLang()
 Class xmlReg()
diff --git a/tree.c b/tree.c
index c3d3045..807189e 100644
--- a/tree.c
+++ b/tree.c
@@ -6603,10 +6603,10 @@
             (cur->type == XML_ELEMENT_NODE) &&
             (xmlStrEqual(cur->name, BAD_CAST "html"))) {
             if (encoding != NULL)
-                htmlSetMetaEncoding((htmlDocPtr) cur,
+                htmlSetMetaEncoding((htmlDocPtr) doc,
                                     (const xmlChar *) encoding);
             else
-                htmlSetMetaEncoding((htmlDocPtr) cur, BAD_CAST "UTF-8");
+                htmlSetMetaEncoding((htmlDocPtr) doc, BAD_CAST "UTF-8");
         }
     }
 
diff --git a/win32/Makefile.mingw b/win32/Makefile.mingw
index 2e49167..2a7d555 100644
--- a/win32/Makefile.mingw
+++ b/win32/Makefile.mingw
@@ -10,7 +10,7 @@
 #                 a 'nmake clean' and then a 'nmake all'.
 # nmake install   to install the library and its header files.
 #
-# November 2002, Igor Zlatkovic <igor@stud.fh-frankfurt.de>
+# November 2002, Igor Zlatkovic <igor@zlatkovic.com>
 
 AUTOCONF = .\config.mingw
 
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
index 87064ad..a723746 100644
--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
@@ -10,7 +10,7 @@
 #                 a 'nmake clean' and then a 'nmake all'.
 # nmake install   to install the library and its header files.
 #
-# March 2002, Igor Zlatkovic <igor@stud.fh-frankfurt.de>
+# March 2002, Igor Zlatkovic <igor@zlatkovic.com>
 
 AUTOCONF = .\config.msvc
 
diff --git a/win32/Readme.txt b/win32/Readme.txt
index bd3f173..ba909c0 100644
--- a/win32/Readme.txt
+++ b/win32/Readme.txt
@@ -129,5 +129,5 @@
 which I have never seen.
 
 
-November 2002, Igor Zlatkovic <igor@stud.fh-frankfurt.de>
+November 2002, Igor Zlatkovic <igor@zlatkovic.com>
 
diff --git a/win32/configure.js b/win32/configure.js
index c3eaaff..14617fa 100644
--- a/win32/configure.js
+++ b/win32/configure.js
@@ -4,7 +4,7 @@
  * Run it with an 'help', or an invalid option and it will tell you what options
  * it accepts.
  *
- * March 2002, Igor Zlatkovic <igor@stud.fh-frankfurt.de>
+ * March 2002, Igor Zlatkovic <igor@zlatkovic.com>
  */
 
 /* The source directory, relative to the one where this file resides. */
@@ -330,7 +330,7 @@
 	f.WriteLine("a cheer of joy, a comment or a suggestion, feel free to contact me using");
 	f.WriteLine("the address below.");
 	f.WriteBlankLines(1);
-	f.WriteLine("                              Igor Zlatkovic (igor@stud.fh-frankfurt.de)");
+	f.WriteLine("                              Igor Zlatkovic (igor@zlatkovic.com)");
 	f.Close();
 }
 
diff --git a/win32/libxml2.def.src b/win32/libxml2.def.src
index 8bc13db..01a4a09 100644
--- a/win32/libxml2.def.src
+++ b/win32/libxml2.def.src
@@ -13,7 +13,7 @@
    from the libxml2.dll, its name is most certainly missing here.
    Add the name of the offending function to this file and rebuild.
 
-   21.03.2001, Igor Zlatkovic (igor@stud.fh-frankfurt.de)
+   21.03.2001, Igor Zlatkovic (igor@zlatkovic.com)
 */
 
 #define LIBXML2_COMPILING_MSCCDEF
diff --git a/xmlreader.c b/xmlreader.c
index 68632c6..254fd54 100644
--- a/xmlreader.c
+++ b/xmlreader.c
@@ -87,6 +87,7 @@
     xmlNodePtr			node;	/* current node */
     xmlNodePtr			curnode;/* current attribute node */
     int				depth;  /* depth of the current node */
+    xmlNodePtr			faketext;/* fake xmlNs chld */
 };
 
 #ifdef DEBUG_READER
@@ -436,6 +437,62 @@
     return(NULL);
 }
 
+/**
+ * xmlTextReaderReadBase64:
+ * @reader:  the xmlTextReaderPtr used
+ * @array:  a byte array to store the content.
+ * @offset:  the zero-based index into array where the method should
+ *           begin to write.
+ * @len:  the number of bytes to write.
+ *
+ * Reads and decodes the Base64 encoded contents of an element and
+ * stores the result in a byte buffer.
+ *
+ * Returns the number of bytes written to array, or zero if the current
+ *         instance is not positioned on an element or -1 in case of error.
+ */
+int
+xmlTextReaderReadBase64(xmlTextReaderPtr reader, unsigned char *array,
+	                int offset, int len) {
+    if ((reader == NULL) || (reader->ctxt == NULL))
+	return(-1);
+    if (reader->ctxt->wellFormed != 1)
+	return(-1);
+
+    if ((reader->node == NULL) || (reader->node->type == XML_ELEMENT_NODE))
+	return(0);
+    TODO
+    return(0);
+}
+
+/**
+ * xmlTextReaderReadBinHex:
+ * @reader:  the xmlTextReaderPtr used
+ * @array:  a byte array to store the content.
+ * @offset:  the zero-based index into array where the method should
+ *           begin to write.
+ * @len:  the number of bytes to write.
+ *
+ * Reads and decodes the BinHex encoded contents of an element and
+ * stores the result in a byte buffer.
+ *
+ * Returns the number of bytes written to array, or zero if the current
+ *         instance is not positioned on an element or -1 in case of error.
+ */
+int
+xmlTextReaderReadBinHex(xmlTextReaderPtr reader, unsigned char *array,
+	                int offset, int len) {
+    if ((reader == NULL) || (reader->ctxt == NULL))
+	return(-1);
+    if (reader->ctxt->wellFormed != 1)
+	return(-1);
+
+    if ((reader->node == NULL) || (reader->node->type == XML_ELEMENT_NODE))
+	return(0);
+    TODO
+    return(0);
+}
+
 /************************************************************************
  *									*
  *			Constructor and destructors			*
@@ -544,6 +601,9 @@
 	xmlFree(reader->sax);
     if ((reader->input != NULL)  && (reader->allocs & XML_TEXTREADER_INPUT))
 	xmlFreeParserInputBuffer(reader->input);
+    if (reader->faketext != NULL) {
+	xmlFreeNode(reader->faketext);
+    }
     xmlFree(reader);
 }
 
@@ -1082,6 +1142,48 @@
     return(0);
 }
 
+/**
+ * xmlTextReaderReadAttributeValue:
+ * @reader:  the xmlTextReaderPtr used
+ *
+ * Parses an attribute value into one or more Text and EntityReference nodes.
+ *
+ * Returns 1 in case of success, 0 if the reader was not positionned on an
+ *         ttribute node or all the attribute values have been read, or -1
+ *         in case of error.
+ */
+int
+xmlTextReaderReadAttributeValue(xmlTextReaderPtr reader) {
+    if (reader == NULL)
+	return(-1);
+    if (reader->node == NULL)
+	return(-1);
+    if (reader->curnode == NULL)
+	return(0);
+    if (reader->curnode->type == XML_ATTRIBUTE_NODE) {
+	if (reader->curnode->children == NULL)
+	    return(0);
+	reader->curnode = reader->curnode->children;
+    } else if (reader->curnode->type == XML_NAMESPACE_DECL) {
+	xmlNsPtr ns = (xmlNsPtr) reader->curnode;
+
+	if (reader->faketext == NULL) {
+	    reader->faketext = xmlNewDocText(reader->node->doc, 
+		                             ns->href);
+	} else {
+            if (reader->faketext->content != NULL)
+		xmlFree(reader->faketext->content);
+	    reader->faketext->content = xmlStrdup(ns->href);
+	}
+	reader->curnode = reader->faketext;
+    } else {
+	if (reader->curnode->next == NULL)
+	    return(0);
+	reader->curnode = reader->curnode->next;
+    }
+    return(1);
+}
+
 /************************************************************************
  *									*
  *			Acces API to the current node			*
@@ -1412,6 +1514,12 @@
     if (reader->node == NULL)
 	return(0);
 
+    if (reader->curnode != NULL) {
+	if ((reader->curnode->type == XML_ATTRIBUTE_NODE) ||
+	    (reader->curnode->type == XML_NAMESPACE_DECL))
+	    return(reader->depth + 1);
+	return(reader->depth + 2);
+    }
     return(reader->depth);
 }
 
@@ -1589,3 +1697,272 @@
     return(1);
 }
 
+/************************************************************************
+ *									*
+ *			Extensions to the base APIs			*
+ *									*
+ ************************************************************************/
+
+/**
+ * xmlTextReaderSetParserProp:
+ * @reader:  the xmlTextReaderPtr used
+ * @prop:  the xmlParserProperties to set
+ * @value:  usually 0 or 1 to (de)activate it
+ *
+ * Change the parser processing behaviour by changing some of its internal
+ * properties. Note that some properties can only be changed before any
+ * read has been done.
+ *
+ * Returns 0 if the call was successful, or -1 in case of error
+ */
+int
+xmlTextReaderSetParserProp(xmlTextReaderPtr reader, int prop, int value) {
+    xmlParserProperties p = (xmlParserProperties) prop;
+    xmlParserCtxtPtr ctxt;
+
+    if ((reader == NULL) || (reader->ctxt == NULL))
+	return(-1);
+    ctxt = reader->ctxt;
+
+    switch (p) {
+        case XML_PARSER_LOADDTD:
+	    if (value != 0) {
+		if (ctxt->loadsubset == 0) {
+		    if (reader->mode != XML_TEXTREADER_MODE_INITIAL)
+			return(-1);
+		    ctxt->loadsubset = XML_DETECT_IDS;
+		}
+	    } else {
+		ctxt->loadsubset = 0;
+	    }
+	    return(0);
+        case XML_PARSER_DEFAULTATTRS:
+	    if (value != 0) {
+		ctxt->loadsubset |= XML_COMPLETE_ATTRS;
+	    } else {
+		if (ctxt->loadsubset & XML_COMPLETE_ATTRS)
+		    ctxt->loadsubset -= XML_COMPLETE_ATTRS;
+	    }
+	    return(0);
+        case XML_PARSER_VALIDATE:
+	    if (value != 0) {
+		ctxt->validate = 1;
+	    } else {
+		ctxt->validate = 0;
+	    }
+	    return(0);
+    }
+    return(-1);
+}
+
+/**
+ * xmlTextReaderGetParserProp:
+ * @reader:  the xmlTextReaderPtr used
+ * @prop:  the xmlParserProperties to get
+ *
+ * Read the parser internal property.
+ *
+ * Returns the value, usually 0 or 1, or -1 in case of error.
+ */
+int
+xmlTextReaderGetParserProp(xmlTextReaderPtr reader, int prop) {
+    xmlParserProperties p = (xmlParserProperties) prop;
+    xmlParserCtxtPtr ctxt;
+
+    if ((reader == NULL) || (reader->ctxt == NULL))
+	return(-1);
+    ctxt = reader->ctxt;
+
+    switch (p) {
+        case XML_PARSER_LOADDTD:
+	    if ((ctxt->loadsubset != 0) || (ctxt->validate != 0))
+		return(1);
+	    return(0);
+        case XML_PARSER_DEFAULTATTRS:
+	    if (ctxt->loadsubset & XML_COMPLETE_ATTRS)
+		return(1);
+	    return(0);
+        case XML_PARSER_VALIDATE:
+	    return(ctxt->validate);
+    }
+    return(-1);
+}
+
+/************************************************************************
+ *									*
+ *			Utilities					*
+ *									*
+ ************************************************************************/
+/**
+ * xmlBase64Decode:
+ * @in:  the input buffer
+ * @inlen:  the size of the input (in), the size read from it (out)
+ * @to:  the output buffer
+ * @tolen:  the size of the output (in), the size written to (out)
+ *
+ * Base64 decoder, reads from @in and save in @to
+ *
+ * Returns 0 if all the input was consumer, 1 if the Base64 end was reached,
+ *         2 if there wasn't enough space on the output or -1 in case of error.
+ */
+static int
+xmlBase64Decode(const unsigned char *in, unsigned long *inlen,
+	        unsigned char *to, unsigned long *tolen) {
+    unsigned long incur;		/* current index in in[] */
+    unsigned long inblk;		/* last block index in in[] */
+    unsigned long outcur;		/* current index in out[] */
+    unsigned long inmax;		/* size of in[] */
+    unsigned long outmax;		/* size of out[] */
+    unsigned char cur;			/* the current value read from in[] */
+    unsigned char intmp[3], outtmp[4];	/* temporary buffers for the convert */
+    int nbintmp;			/* number of byte in intmp[] */
+    int is_ignore;			/* cur should be ignored */
+    int is_end = 0;			/* the end of the base64 was found */
+    int retval = 1;
+    int i;
+
+    if ((in == NULL) || (inlen == NULL) || (to == NULL) || (tolen == NULL))
+	return(-1);
+
+    incur = 0;
+    inblk = 0;
+    outcur = 0;
+    inmax = *inlen;
+    outmax = *tolen;
+    nbintmp = 0;
+
+    while (1) {
+        if (incur >= inmax)
+            break;
+        cur = in[incur++];
+        is_ignore = 0;
+        if ((cur >= 'A') && (cur <= 'Z'))
+            cur = cur - 'A';
+        else if ((cur >= 'a') && (cur <= 'z'))
+            cur = cur - 'a' + 26;
+        else if ((cur >= '0') && (cur <= '9'))
+            cur = cur - '0' + 52;
+        else if (cur == '+')
+            cur = 62;
+        else if (cur == '/')
+            cur = 63;
+        else if (cur == '.')
+            cur = 0;
+        else if (cur == '=') /*no op , end of the base64 stream */
+            is_end = 1;
+        else {
+            is_ignore = 1;
+	    if (nbintmp == 0)
+		inblk = incur;
+	}
+
+        if (!is_ignore) {
+            int nbouttmp = 3;
+            int is_break = 0;
+
+            if (is_end) {
+                if (nbintmp == 0)
+                    break;
+                if ((nbintmp == 1) || (nbintmp == 2))
+                    nbouttmp = 1;
+                else
+                    nbouttmp = 2;
+                nbintmp = 3;
+                is_break = 1;
+            }
+            intmp[nbintmp++] = cur;
+	    /*
+	     * if intmp is full, push the 4byte sequence as a 3 byte
+	     * sequence out
+	     */
+            if (nbintmp == 4) {
+                nbintmp = 0;
+                outtmp[0] = (intmp[0] << 2) | ((intmp[1] & 0x30) >> 4);
+                outtmp[1] =
+                    ((intmp[1] & 0x0F) << 4) | ((intmp[2] & 0x3C) >> 2);
+                outtmp[2] = ((intmp[2] & 0x03) << 6) | (intmp[3] & 0x3F);
+		if (outcur + 3 >= outmax) {
+		    retval = 2;
+		    break;
+		}
+
+                for (i = 0; i < nbouttmp; i++)
+		    to[outcur++] = outtmp[i];
+		inblk = incur;
+            }
+
+            if (is_break) {
+		retval = 0;
+                break;
+	    }
+        }
+    }
+
+    *tolen = outcur;
+    *inlen = inblk;
+    return (retval);
+}
+
+/*
+ * Test routine for the xmlBase64Decode function
+ */
+#if 0
+int main(int argc, char **argv) {
+    char *input = "  VW4 gcGV0        \n      aXQgdGVzdCAuCg== ";
+    char output[100];
+    char output2[100];
+    char output3[100];
+    unsigned long inlen = strlen(input);
+    unsigned long outlen = 100;
+    int ret;
+    unsigned long cons, tmp, tmp2, prod;
+
+    /*
+     * Direct
+     */
+    ret = xmlBase64Decode(input, &inlen, output, &outlen);
+
+    output[outlen] = 0;
+    printf("ret: %d, inlen: %ld , outlen: %ld, output: '%s'\n", ret, inlen, outlen, output);
+    
+    /*
+     * output chunking
+     */
+    cons = 0;
+    prod = 0;
+    while (cons < inlen) {
+	tmp = 5;
+	tmp2 = inlen - cons;
+
+	printf("%ld %ld\n", cons, prod);
+	ret = xmlBase64Decode(&input[cons], &tmp2, &output2[prod], &tmp);
+	cons += tmp2;
+	prod += tmp;
+	printf("%ld %ld\n", cons, prod);
+    }
+    output2[outlen] = 0;
+    printf("ret: %d, cons: %ld , prod: %ld, output: '%s'\n", ret, cons, prod, output2);
+
+    /*
+     * input chunking
+     */
+    cons = 0;
+    prod = 0;
+    while (cons < inlen) {
+	tmp = 100 - prod;
+	tmp2 = inlen - cons;
+	if (tmp2 > 5)
+	    tmp2 = 5;
+
+	printf("%ld %ld\n", cons, prod);
+	ret = xmlBase64Decode(&input[cons], &tmp2, &output3[prod], &tmp);
+	cons += tmp2;
+	prod += tmp;
+	printf("%ld %ld\n", cons, prod);
+    }
+    output3[outlen] = 0;
+    printf("ret: %d, cons: %ld , prod: %ld, output: '%s'\n", ret, cons, prod, output3);
+    return(0);
+
+}
+#endif