diff --git a/ChangeLog b/ChangeLog
index 96959431..888afd76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jun 26 18:05:26 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* configure.in doc/xml.html include/libxml/xmlwin32version.h:
+	  release of 2.3.12
+	* parser.c: make an error message if unknow entities in all cases
+
 Tue Jun 26 09:46:29 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* uri.c: fixed 2 uri normalization bugs on '//' reduction
diff --git a/configure.in b/configure.in
index 9dd0f6f7..755db6dc 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ AC_CANONICAL_HOST
 
 LIBXML_MAJOR_VERSION=2
 LIBXML_MINOR_VERSION=3
-LIBXML_MICRO_VERSION=11
+LIBXML_MICRO_VERSION=12
 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION
 LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
 
diff --git a/doc/xml.html b/doc/xml.html
index 8d4612a3..2e317798 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -1,5 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-    "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
   <title>The XML C library for Gnome</title>
@@ -246,6 +244,22 @@ you want to test those</p>
     docs</li>
 </ul>
 
+<h3>2.3.12: June 26 2001</h3>
+<ul>
+  <li>lots of cleanup</li>
+  <li>a couple of validation fix</li>
+  <li>fixed line number counting</li>
+  <li>fixed serious problems in the XInclude processing</li>
+  <li>added support for UTF8 BOM at beginning of entities</li>
+  <li>fixed a strange gcc optimizer bugs in xpath handling of float, gcc-3.0
+    miscompile uri.c (William), Thomas Leitner provided a fix for the
+    optimizer on Tru64</li>
+  <li>incorporated Yon Derek and Igor Zlatkovic  fixes and improvements for
+    compilation on Windows MSC</li>
+  <li>update of libxml-doc.el (Felix Natter)</li>
+  <li>fixed 2 bugs in URI normalization code</li>
+</ul>
+
 <h3>2.3.11: June 17 2001</h3>
 <ul>
   <li>updates to trio, Makefiles and configure should fix some portability
@@ -1577,6 +1591,6 @@ Gnome CVS base under gnome-xml/example</p>
 
 <p><a href="mailto:Daniel.Veillard@imag.fr">Daniel Veillard</a></p>
 
-<p>$Id: xml.html,v 1.91 2001/06/24 12:13:21 veillard Exp $</p>
+<p>$Id: xml.html,v 1.92 2001/06/25 15:08:36 veillard Exp $</p>
 </body>
 </html>
diff --git a/include/libxml/xmlwin32version.h b/include/libxml/xmlwin32version.h
index ff63e78e..a6ffdd06 100644
--- a/include/libxml/xmlwin32version.h
+++ b/include/libxml/xmlwin32version.h
@@ -18,10 +18,10 @@ extern "C" {
  * use those to be sure nothing nasty will happen if
  * your library and includes mismatch
  */
-#define LIBXML_DOTTED_VERSION "2.3.11"
-#define LIBXML_VERSION 20311
-#define LIBXML_VERSION_STRING "20311"
-#define LIBXML_TEST_VERSION xmlCheckVersion(20311);
+#define LIBXML_DOTTED_VERSION "2.3.12"
+#define LIBXML_VERSION 20312
+#define LIBXML_VERSION_STRING "20312"
+#define LIBXML_TEST_VERSION xmlCheckVersion(20312);
 
 /**
  * WITH_TRIO:
diff --git a/parser.c b/parser.c
index 3ae7ba48..9c76c8fc 100644
--- a/parser.c
+++ b/parser.c
@@ -5232,7 +5232,7 @@ xmlParseEntityRef(xmlParserCtxtPtr ctxt) {
 		    } else {
 			ctxt->errNo = XML_WAR_UNDECLARED_ENTITY;
 			if ((ctxt->sax != NULL) && (ctxt->sax->warning != NULL))
-			    ctxt->sax->warning(ctxt->userData, 
+			    ctxt->sax->error(ctxt->userData, 
 				 "Entity '%s' not defined\n", name);
 		    }
 		}
