diff --git a/README b/README
index efc1fad..d89c527 100644
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
-README - 2014-10-19
+README - 2016-06-12
 -------------------
 
 
 INTRODUCTION
 
-    This README file describes the Mini-XML library version 2.9.
+    This README file describes the Mini-XML library version 2.10.
 
     Mini-XML is a small XML parsing library that you can use to read XML and
     XML-like data files in your application without requiring large non-standard
@@ -52,7 +52,7 @@ BUILDING Mini-XML
 
     If you are using Mini-XML under Microsoft Windows with Visual C++, use the
     included project files in the "vcnet" subdirectory to build the library
-    instead.
+    instead.  Note: The static library on Windows is NOT thread-safe.
 
 
 INSTALLING Mini-XML
@@ -192,5 +192,5 @@ GETTING HELP AND REPORTING PROBLEMS
 
 LEGAL STUFF
 
-    The Mini-XML library is Copyright 2003-2014 by Michael Sweet.  License terms
-    are described in the file "COPYING".
+    The Mini-XML library is Copyright 2003-2016 by Michael R Sweet.  License
+    terms are described in the file "COPYING".
diff --git a/doc/intro.html b/doc/intro.html
index efe0e78..e44de57 100644
--- a/doc/intro.html
+++ b/doc/intro.html
@@ -1,8 +1,8 @@
 <html>
 <head>
-	<title>Mini-XML Programmers Manual, Version 2.9</title>
-	<meta name="copyright" content="Copyright 2003-2014">
-	<meta name="author" content="Michael R. Sweet">
+	<title>Mini-XML Programmers Manual, Version 2.10</title>
+	<meta name="copyright" content="Copyright 2003-2016">
+	<meta name="author" content="Michael R Sweet">
 	<meta name="keywords" content="XML, C, C++, library">
 </head>
 <body>
@@ -10,7 +10,7 @@
 <h1 align="right"><a name="INTRO"><img src="0.gif" align="right"
 hspace="10" width="100" height="100" alt="0"></a>Introduction</h1>
 
-<p>This programmers manual describes Mini-XML version 2.9, a small
+<p>This programmers manual describes Mini-XML version 2.10, a small
 XML parsing library that you can use to read and write XML data
 files in your C and C++ applications.</p>
 
@@ -187,7 +187,7 @@ manual:</p>
 <!-- NEED 6 -->
 <h2>Legal Stuff</h2>
 
-<p>The Mini-XML library is copyright 2003-2014 by Michael R Sweet. License terms
+<p>The Mini-XML library is copyright 2003-2016 by Michael R Sweet. License terms
 are described in <a href="#LICENSE">Appendix A - Mini-XML License</a>.</p>
 
 </body>
diff --git a/doc/mxml.html b/doc/mxml.html
index 551a944..97f495a 100644
--- a/doc/mxml.html
+++ b/doc/mxml.html
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <HTML>
 <HEAD>
-<TITLE>Mini-XML Programmers Manual, Version 2.9</TITLE>
-<META NAME="author" CONTENT="Michael R. Sweet">
-<META NAME="copyright" CONTENT="Copyright 2003-2014">
+<TITLE>Mini-XML Programmers Manual, Version 2.10</TITLE>
+<META NAME="author" CONTENT="Michael R Sweet">
+<META NAME="copyright" CONTENT="Copyright 2003-2016">
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=iso-iso-8859-1">
 <STYLE TYPE="text/css"><!--
 BODY { font-family: sans-serif }
@@ -198,7 +198,7 @@ A { text-decoration: none }
 <HR NOSHADE>
 <H1 align="right"><A name="INTRO"><IMG align="right" alt="0" height="100"
 hspace="10" src="0.gif" width="100"></A>Introduction</H1>
-<P>This programmers manual describes Mini-XML version 2.9, a small XML
+<P>This programmers manual describes Mini-XML version 2.10, a small XML
  parsing library that you can use to read and write XML data files in
  your C and C++ applications.</P>
 <P>Mini-XML was initially developed for the <A href="http://gutenprint.sf.net/">
@@ -333,7 +333,7 @@ libxml2</TT> library with something substantially smaller and
 
 <!-- NEED 6 -->
 <H2><A NAME="1_5">Legal Stuff</A></H2>
-<P>The Mini-XML library is copyright 2003-2014 by Michael R Sweet.
+<P>The Mini-XML library is copyright 2003-2016 by Michael R Sweet.
  License terms are described in <A href="#LICENSE">Appendix A - Mini-XML
  License</A>.</P>
 <HR NOSHADE>
@@ -2024,12 +2024,24 @@ hspace="10" src="A.gif" width="100"></A>Mini-XML License</H1>
 <HR NOSHADE>
 <H1 align="right"><A name="RELNOTES"><IMG align="right" alt="B" height="100"
 hspace="10" src="B.gif" width="100"></A>Release Notes</H1>
-<H2><A NAME="7_1">Changes in Mini-XML 2.9</A></H2>
+<H2><A NAME="7_1">Changes in Mini-XML 2.10</A></H2>
+<UL>
+<LI>The version number in mxml.h was wrong (Bug #532)</LI>
+<LI>The mxml.spec file was out of date (Bug #521)</LI>
+<LI>Mini-XML no longer allows malformed element names (Bug #509)</LI>
+<LI>mxmlLoad* and mxmlSAXLoad* did not properly create text nodes when
+ MXML_TEXT_CALLBACK was specified (Bug #531)</LI>
+<LI>mxmlDelete used a recursive algorithm which could require large
+ amounts of stack space depending on the file (Bug #549, CVE-2016-4570)</LI>
+<LI>mxmlWrite* used a recursive algorithm which could require large
+ amounts of stack space depending on the file (Bug #549, CVE-2016-4571)</LI>
+</UL>
+<H2><A NAME="7_2">Changes in Mini-XML 2.9</A></H2>
 <UL>
 <LI>mxmlLoad* did not correctly load value nodes with MXML_NO_CALLBACK
  or MXML_TEXT_CALLBACK (Bug #502)</LI>
 </UL>
-<H2><A NAME="7_2">Changes in Mini-XML 2.8</A></H2>
+<H2><A NAME="7_3">Changes in Mini-XML 2.8</A></H2>
 <UL>
 <LI>Now call docsetutil using xcrun on OS X (Bug #458)</LI>
 <LI>mxmldoc did not escape special HTML characters inside @code foo@
@@ -2040,7 +2052,7 @@ hspace="10" src="B.gif" width="100"></A>Release Notes</H1>
 <LI>Fixed a memory leak when loading invalid XML (Bug #496)</LI>
 <LI>Fixed an XML fragment loading problem (Bug #494)</LI>
 </UL>
-<H2><A NAME="7_3">Changes in Mini-XML 2.7</A></H2>
+<H2><A NAME="7_4">Changes in Mini-XML 2.7</A></H2>
 <UL>
 <LI>Added 64-bit configurations to the VC++ project files (STR #129)</LI>
 <LI>Fixed conformance of mxmldoc's HTML and CSS output.</LI>
@@ -2061,7 +2073,7 @@ hspace="10" src="B.gif" width="100"></A>Release Notes</H1>
 <LI>mxmlSave* no longer write all siblings of the passed node, just that
  node and its children (STR #109)</LI>
 </UL>
-<H2><A NAME="7_4">Changes in Mini-XML 2.6</A></H2>
+<H2><A NAME="7_5">Changes in Mini-XML 2.6</A></H2>
 <UL>
 <LI>Documentation fixes (STR #91, STR #92)</LI>
 <LI>The mxmldoc program did not handle typedef comments properly (STR
@@ -2080,7 +2092,7 @@ hspace="10" src="B.gif" width="100"></A>Release Notes</H1>
 <LI>The mxmldoc program now handles &quot;typedef enum name {} name&quot;
  correctly (STR #72)</LI>
 </UL>
-<H2><A NAME="7_5">Changes in Mini-XML 2.5</A></H2>
+<H2><A NAME="7_6">Changes in Mini-XML 2.5</A></H2>
 <UL>
 <LI>The mxmldoc program now makes greater use of CSS and supports a
  --css option to embed an alternate stylesheet.</LI>
@@ -2097,7 +2109,7 @@ hspace="10" src="B.gif" width="100"></A>Release Notes</H1>
  top level of a document (STR #67)</LI>
 <LI>Spaces around the &quot;=&quot; in attributes were not supported (STR #67)</LI>
 </UL>
-<H2><A NAME="7_6">Changes in Mini-XML 2.4</A></H2>
+<H2><A NAME="7_7">Changes in Mini-XML 2.4</A></H2>
 <UL>
 <LI>Fixed shared library build problems on HP-UX and Mac OS X.</LI>
 <LI>The mxmldoc program did not output argument descriptions for
@@ -2117,7 +2129,7 @@ hspace="10" src="B.gif" width="100"></A>Release Notes</H1>
 <LI>mxmlWalkNext() and mxmlWalkPrev() did not work correctly when called
  with a node with no children as the top node (STR #53)</LI>
 </UL>
-<H2><A NAME="7_7">Changes in Mini-XML 2.3</A></H2>
+<H2><A NAME="7_8">Changes in Mini-XML 2.3</A></H2>
 <UL>
 <LI>Added two exceptions to the LGPL to support static linking of
  applications against Mini-XML</LI>
@@ -2155,12 +2167,12 @@ hspace="10" src="B.gif" width="100"></A>Release Notes</H1>
 <LI>mxmlLoad*() did not treat custom data as opaque, so whitespace
  characters would be lost</LI>
 </UL>
-<H2><A NAME="7_8">Changes in Mini-XML 2.2.2</A></H2>
+<H2><A NAME="7_9">Changes in Mini-XML 2.2.2</A></H2>
 <UL>
 <LI>mxmlLoad*() did not treat custom data as opaque, so whitespace
  characters would be lost.</LI>
 </UL>
-<H2><A NAME="7_9">Changes in Mini-XML 2.2.1</A></H2>
+<H2><A NAME="7_10">Changes in Mini-XML 2.2.1</A></H2>
 <UL>
 <LI>mxmlLoadFd(), mxmlLoadFile(), and mxmlLoadString() now correctly
  return NULL on error (STR #21)</LI>
@@ -2171,7 +2183,7 @@ hspace="10" src="B.gif" width="100"></A>Release Notes</H1>
  proper permissions on UNIX/Linux/OSX.</LI>
 <LI>Fixed a MingW/Cygwin compilation problem (STR #18)</LI>
 </UL>
-<H2><A NAME="7_10">Changes in Mini-XML 2.2</A></H2>
+<H2><A NAME="7_11">Changes in Mini-XML 2.2</A></H2>
 <UL>
 <LI>Added shared library support (STR #17)</LI>
 <LI>mxmlLoad*() now returns an error when an XML stream contains illegal
@@ -2185,7 +2197,7 @@ hspace="10" src="B.gif" width="100"></A>Release Notes</H1>
 <LI>Added checking for invalid comment termination (&quot;---&gt;&quot; is not
  allowed)</LI>
 </UL>
-<H2><A NAME="7_11">Changes in Mini-XML 2.1</A></H2>
+<H2><A NAME="7_12">Changes in Mini-XML 2.1</A></H2>
 <UL>
 <LI>Added support for custom data nodes (STR #6)</LI>
 <LI>Now treat UTF-8 sequences which are longer than necessary as an
@@ -2196,7 +2208,7 @@ hspace="10" src="B.gif" width="100"></A>Release Notes</H1>
 <LI>Added mxmlLoadFd() and mxmlSaveFd() functions.</LI>
 <LI>Fixed multi-word UTF-16 handling.</LI>
 </UL>
-<H2><A NAME="7_12">Changes in Mini-XML 2.0</A></H2>
+<H2><A NAME="7_13">Changes in Mini-XML 2.0</A></H2>
 <UL>
 <LI>New programmers manual.</LI>
 <LI>Added Visual C++ project files for Microsoft Windows users.</LI>
@@ -2229,7 +2241,7 @@ hspace="10" src="B.gif" width="100"></A>Release Notes</H1>
  destination path and install path. This caused problems when building
  and installing with MingW.</LI>
 </UL>
-<H2><A NAME="7_13">Changes in Mini-XML 1.3</A></H2>
+<H2><A NAME="7_14">Changes in Mini-XML 1.3</A></H2>
 <UL>
 <LI>Fixes for mxmldoc.</LI>
 <LI>Added support for reading standard HTML entity names.</LI>
@@ -2245,7 +2257,7 @@ hspace="10" src="B.gif" width="100"></A>Release Notes</H1>
 <LI>The load and save functions now properly handle quoted element and
  attribute name strings properly, e.g. for !DOCTYPE declarations.</LI>
 </UL>
-<H2><A NAME="7_14">Changes in Mini-XML 1.2</A></H2>
+<H2><A NAME="7_15">Changes in Mini-XML 1.2</A></H2>
 <UL>
 <LI>Added new &quot;set&quot; methods to set the value of a node.</LI>
 <LI>Added new formatted text methods mxmlNewTextf() and mxmlSetTextf()
@@ -2258,13 +2270,13 @@ hspace="10" src="B.gif" width="100"></A>Release Notes</H1>
 <LI>Added --with/without-snprintf configure option to control the
  snprintf() and vsnprintf() function checks.</LI>
 </UL>
-<H2><A NAME="7_15">Changes in Mini-XML 1.1.2</A></H2>
+<H2><A NAME="7_16">Changes in Mini-XML 1.1.2</A></H2>
 <UL>
 <LI>The mxml(3) man page wasn't updated for the string functions.</LI>
 <LI>mxmlSaveString() returned the wrong number of characters.</LI>
 <LI>mxml_add_char() updated the buffer pointer in the wrong place.</LI>
 </UL>
-<H2><A NAME="7_16">Changes in Mini-XML 1.1.1</A></H2>
+<H2><A NAME="7_17">Changes in Mini-XML 1.1.1</A></H2>
 <UL>
 <LI>The private mxml_add_ch() function did not update the
  start-of-buffer pointer which could cause a crash when using
@@ -2275,7 +2287,7 @@ hspace="10" src="B.gif" width="100"></A>Release Notes</H1>
 <LI>Added a mxmlSaveAllocString() convenience function for saving an XML
  node tree to an allocated string.</LI>
 </UL>
-<H2><A NAME="7_17">Changes in Mini-XML 1.1</A></H2>
+<H2><A NAME="7_18">Changes in Mini-XML 1.1</A></H2>
 <UL>
 <LI>The mxmlLoadFile() function now uses dynamically allocated string
  buffers for element names, attribute names, and attribute values.
@@ -2287,7 +2299,7 @@ hspace="10" src="B.gif" width="100"></A>Release Notes</H1>
 <LI>Add emulation of strdup() if the local platform does not provide the
  function.</LI>
 </UL>
-<H2><A NAME="7_18">Changes in Mini-XML 1.0</A></H2>
+<H2><A NAME="7_19">Changes in Mini-XML 1.0</A></H2>
 <UL>
 <LI>The mxmldoc program now handles function arguments, structures,
  unions, enumerations, classes, and typedefs properly.</LI>
@@ -2295,7 +2307,7 @@ hspace="10" src="B.gif" width="100"></A>Release Notes</H1>
  code.</LI>
 <LI>Added man pages and packaging files.</LI>
 </UL>
-<H2><A NAME="7_19">Changes in Mini-XML 0.93</A></H2>
+<H2><A NAME="7_20">Changes in Mini-XML 0.93</A></H2>
 <UL>
 <LI>New mxmldoc example program that is also used to create and update
  code documentation using XML and produce HTML reference pages.</LI>
@@ -2320,15 +2332,15 @@ hspace="10" src="B.gif" width="100"></A>Release Notes</H1>
 <LI>mxmlSaveFile() now supports a whitespace callback to provide more
  human-readable XML output under program control.</LI>
 </UL>
-<H2><A NAME="7_20">Changes in Mini-XML 0.92</A></H2>
+<H2><A NAME="7_21">Changes in Mini-XML 0.92</A></H2>
 <UL>
 <LI>mxmlSaveFile() didn't return a value on success.</LI>
 </UL>
-<H2><A NAME="7_21">Changes in Mini-XML 0.91</A></H2>
+<H2><A NAME="7_22">Changes in Mini-XML 0.91</A></H2>
 <UL>
 <LI>mxmlWalkNext() would go into an infinite loop.</LI>
 </UL>
-<H2><A NAME="7_22">Changes in Mini-XML 0.9</A></H2>
+<H2><A NAME="7_23">Changes in Mini-XML 0.9</A></H2>
 <UL>
 <LI>Initial public release.</LI>
 </UL>
diff --git a/doc/relnotes.html b/doc/relnotes.html
index 6ac2ab4..9471c89 100644
--- a/doc/relnotes.html
+++ b/doc/relnotes.html
@@ -4,6 +4,17 @@
 <h1 align='right'><a name='RELNOTES'><img src="B.gif" align="right"
 hspace="10" width="100" height="100" alt="B"></a>Release Notes</h1>
 
+<h2 _hd_omit_toc>Changes in Mini-XML 2.10</h2>
+
+<ul>
+	<li>The version number in mxml.h was wrong (Bug #532)</li>
+	<li>The mxml.spec file was out of date (Bug #521)</li>
+	<li>Mini-XML no longer allows malformed element names (Bug #509)</li>
+	<li>mxmlLoad* and mxmlSAXLoad* did not properly create text nodes when MXML_TEXT_CALLBACK was specified (Bug #531)</li>
+	<li>mxmlDelete used a recursive algorithm which could require large amounts of stack space depending on the file (Bug #549, CVE-2016-4570)</li>
+	<li>mxmlWrite* used a recursive algorithm which could require large amounts of stack space depending on the file (Bug #549, CVE-2016-4571)</li>
+</ul>
+
 
 <h2 _hd_omit_toc>Changes in Mini-XML 2.9</h2>
 
diff --git a/doc/title.html b/doc/title.html
index 62b7f85..0f88baf 100644
--- a/doc/title.html
+++ b/doc/title.html
@@ -3,7 +3,7 @@
 <head>
 	<title>Mini-XML Programmers Manual</title>
 	<meta name="author" content="Michael R Sweet">
-	<meta name="copyright" content="Copyright 2003-2014">
+	<meta name="copyright" content="Copyright 2003-2016">
 </head>
 <body>
 
@@ -11,7 +11,7 @@
 <tr><td height="100%">
 
 <H1 ALIGN="CENTER"><FONT SIZE="-1">Mini-XML Programmers Manual<br>
-Version 2.9</H1>
+Version 2.10</H1>
 
 <P ALIGN="CENTER">MICHAEL R. SWEET</P>
 
@@ -19,9 +19,9 @@ Version 2.9</H1>
 </table>
 
 <!-- NEW PAGE -->
-<P><FONT SIZE="+1"><B>Mini-XML Programmers Manual, Version 2.9</B></FONT></P>
+<P><FONT SIZE="+1"><B>Mini-XML Programmers Manual, Version 2.10</B></FONT></P>
 
-<P><B>Copyright &copy; 2003-2014 by Michael R. Sweet</B></P>
+<P><B>Copyright &copy; 2003-2016 by Michael R Sweet</B></P>
 
 <P><SMALL>Permission is granted to copy, distribute and/or modify
 this document under the terms of the GNU Library General Public
diff --git a/vcnet/config.h b/vcnet/config.h
index a8c888c..3a87f60 100644
--- a/vcnet/config.h
+++ b/vcnet/config.h
@@ -3,7 +3,7 @@
  *
  * Configuration file for Mini-XML, a small XML-like file parsing library.
  *
- * Copyright 2003-2014 by Michael R Sweet.
+ * Copyright 2003-2016 by Michael R Sweet.
  *
  * These coded instructions, statements, and computer programs are the
  * property of Michael R Sweet and are protected by Federal copyright
@@ -64,7 +64,7 @@
  * Version number...
  */
 
-#define MXML_VERSION "Mini-XML v2.8"
+#define MXML_VERSION "Mini-XML v2.10"
 
 
 /*
