diff --git a/configure.ac b/configure.ac
index 370e2de..ca911f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@
 
 LIBXML_MAJOR_VERSION=2
 LIBXML_MINOR_VERSION=9
-LIBXML_MICRO_VERSION=8
+LIBXML_MICRO_VERSION=9
 LIBXML_MICRO_VERSION_SUFFIX=
 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX
 LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
diff --git a/doc/libxml2.xsa b/doc/libxml2.xsa
index 33f3848..7f4c048 100644
--- a/doc/libxml2.xsa
+++ b/doc/libxml2.xsa
@@ -8,45 +8,51 @@
   </vendor>
   <product id="libxml2">
     <name>libxml2</name>
-    <version>2.9.7</version>
-    <last-release> Nov 02 2017</last-release>
+    <version>v2.9.8</version>
+    <last-release> Mar 05 2018</last-release>
     <info-url>http://xmlsoft.org/</info-url>
-    <changes>   - Documentation:
-  xmlcatalog: refresh man page wrt. quering system catalog easily (Jan Pokorný)
-  
-   - Portability:
-  Fix deprecated Travis compiler flag (Nick Wellnhofer),
-  Add declaration for DllMain (J. Peter Mugaas),
-  Fix preprocessor conditional in threads.h (J. Peter Mugaas),
-  Fix pointer comparison warnings on 64-bit Windows (J. Peter Mugaas),
-  Fix macro redefinition warning (J. Peter Mugaas),
-  Default to native threads on MinGW-w64 (Nick Wellnhofer),
-  Simplify Windows IO functions (Nick Wellnhofer),
-  Fix runtest on Windows (Nick Wellnhofer),
-  socklen_t is always int on Windows (Nick Wellnhofer),
-  Don't redefine socket error codes on Windows (Nick Wellnhofer),
-  Fix pointer/int cast warnings on 64-bit Windows (Nick Wellnhofer),
-  Fix Windows compiler warnings in xmlCanonicPath (Nick Wellnhofer)
+    <changes>   - Portability:
+  python: remove single use of _PyVerify_fd (Patrick Welche),
+  Build more test executables on Windows/MSVC (Nick Wellnhofer),
+  Stop including ansidecl.h (Nick Wellnhofer),
+  Fix libz and liblzma detection (Nick Wellnhofer),
+  Revert "Compile testapi with -Wno-unused-function" (Nick Wellnhofer)
   
    - Bug Fixes:
-  xmlcatalog: restore ability to query system catalog easily (Jan Pokorný),
-  Fix comparison of nodesets to strings (Nick Wellnhofer)
+  Fix xmlParserEntityCheck (Nick Wellnhofer),
+  Halt parser in case of encoding error (Nick Wellnhofer),
+  Clear entity content in case of errors (Nick Wellnhofer),
+  Change calls to xmlCharEncInput to set flush false when not final call. Having flush incorrectly set to true causes errors for ICU. (Joel Hockey),
+  Fix buffer over-read in xmlParseNCNameComplex (Nick Wellnhofer),
+  Fix ICU library filenames on Windows/MSVC (Nick Wellnhofer),
+  Fix xmlXPathIsNaN broken by recent commit (Nick Wellnhofer),
+  Fix -Wenum-compare warnings (Nick Wellnhofer),
+  Fix callback signature in testapi.c (Nick Wellnhofer),
+  Fix unused parameter warning without ICU (Nick Wellnhofer),
+  Fix IO callback signatures (Nick Wellnhofer),
+  Fix misc callback signatures (Nick Wellnhofer),
+  Fix list callback signatures (Nick Wellnhofer),
+  Fix hash callback signatures (Nick Wellnhofer),
+  Refactor name and type signature for xmlNop (Vlad Tsyrklevich),
+  Fixed ICU to set flush correctly and provide pivot buffer. (Joel Hockey),
+  Skip EBCDIC tests if EBCDIC isn't supported (Nick Wellnhofer)
   
    - Improvements:
-  Add Makefile rules to rebuild HTML man pages (Nick Wellnhofer),
-  Fix mixed decls and code in timsort.h (Nick Wellnhofer),
-  Rework handling of return values in thread tests (Nick Wellnhofer),
-  Fix unused variable warnings in testrecurse (Nick Wellnhofer),
-  Fix -Wimplicit-fallthrough warnings (J. Peter Mugaas),
-  Upgrade timsort.h to latest revision (Nick Wellnhofer),
-  Increase warning level to /W3 under MSVC (Nick Wellnhofer),
-  Fix a couple of warnings in dict.c and threads.c (Nick Wellnhofer),
-  Update .gitignore for Windows (Nick Wellnhofer),
-  Fix unused variable warnings in nanohttp.c (Nick Wellnhofer),
-  Fix the Windows header mess (Nick Wellnhofer),
-  Don't include winsock2.h in xmllint.c (Nick Wellnhofer),
-  Remove generated file python/setup.py from version control (Nick Wellnhofer),
-  Use __linux__ macro in generated code (Nick Wellnhofer)
+  Disable pointer-overflow UBSan checks under Travis (Nick Wellnhofer),
+  Improve handling of context input_id (Daniel Veillard),
+  Add resource file to Windows DLL (ccpaging),
+  Run Travis tests with -Werror (Nick Wellnhofer),
+  Build with "-Wall -Wextra" (Nick Wellnhofer),
+  Fix -Wtautological-pointer-compare warnings (Nick Wellnhofer),
+  Remove unused AC_CHECKs (Nick Wellnhofer),
+  Update information about contributing (Nick Wellnhofer),
+  Fix -Wmisleading-indentation warnings (Nick Wellnhofer),
+  Don't touch CFLAGS in configure.ac (Nick Wellnhofer),
+  Ignore function pointer cast warnings (Nick Wellnhofer),
+  Simplify XPath NaN, inf and -0 handling (Nick Wellnhofer),
+  Introduce xmlPosixStrdup and update xmlMemStrdup (Nick Wellnhofer),
+  Add test for ICU flush and pivot buffer (Nick Wellnhofer),
+  Compile testapi with -Wno-unused-function (Nick Wellnhofer)
   
 
 </changes>
diff --git a/doc/news.html b/doc/news.html
index 65839ad..db07ab6 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -8,7 +8,72 @@
 H3 {font-family: Verdana,Arial,Helvetica}
 A:link, A:visited, A:active { text-decoration: underline }
 </style><title>Releases</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C Logo" /></a><a href="http://www.redhat.com/"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/"><img src="Libxml2-Logo-180x168.gif" alt="Made with Libxml2 Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XML C parser and toolkit of Gnome</h1><h2>Releases</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="html/index.html">Reference Manual</a></li><li><a href="intro.html">Introduction</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="docs.html" style="font-weight:bold">Developer Menu</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="news.html">Releases</a></li><li><a href="XMLinfo.html">XML</a></li><li><a href="XSLT.html">XSLT</a></li><li><a href="xmldtd.html">Validation &amp; DTDs</a></li><li><a href="encoding.html">Encodings support</a></li><li><a href="catalog.html">Catalog support</a></li><li><a href="namespaces.html">Namespaces</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="examples/index.html" style="font-weight:bold">Code Examples</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="guidelines.html">XML Guidelines</a></li><li><a href="ChangeLog.html">Recent Changes</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="http://mail.gnome.org/archives/xml/">Mail archive</a></li><li><a href="http://xmlsoft.org/XSLT/">XSLT libxslt</a></li><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.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://opencsw.org/packages/libxml2">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://lxml.de/">lxml Python bindings</a></li><li><a href="http://cpan.uwinnipeg.ca/dist/XML-LibXML">Perl bindings</a></li><li><a href="http://libxmlplusplus.sourceforge.net/">C++ bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading4">PHP bindings</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://libxml.rubyforge.org/">Ruby bindings</a></li><li><a href="http://tclxml.sourceforge.net/">Tcl bindings</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxml2">Bug Tracker</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>The <a href="ChangeLog.html">change log</a> describes the recents commits
-to the <a href="http://git.gnome.org/browse/libxml2/">GIT</a> code base.</p><p>Here is the list of public releases:</p><h3>v2.9.8: Mar 05 2018</h3><ul>
+to the <a href="http://git.gnome.org/browse/libxml2/">GIT</a> code base.</p><p>Here is the list of public releases:</p><h3>v2.9.9: Jan 03 2019</h3><ul>
+  <li>Security:<br />
+  CVE-2018-9251 CVE-2018-14567 Fix infinite loop in LZMA decompression (Nick Wellnhofer),<br />
+  CVE-2018-14404 Fix nullptr deref with XPath logic ops (Nick Wellnhofer),<br />
+  </li>
+
+  <li>Documentation:<br />
+  reader: Fix documentation comment (Mohammed Sadiq)<br />
+  </li>
+
+  <li>Portability:<br />
+  Fix MSVC build with lzma (Nick Wellnhofer),<br />
+  Variables need 'extern' in static lib on Cygwin (Michael Haubenwallner),<br />
+  Really declare dllexport/dllimport for Cygwin (Michael Haubenwallner),<br />
+  Merge branch 'patch-2' into 'master' (Nick Wellnhofer),<br />
+  Change dir to $THEDIR after ACLOCAL_PATH check autoreconf creates aclocal.m4 in $srcdir (Vitaly Buka),<br />
+  Improve error message if pkg.m4 couldn't be found (Nick Wellnhofer),<br />
+  NaN and Inf fixes for pre-C99 compilers (Nick Wellnhofer)<br />
+  </li>
+
+  <li>Bug Fixes:<br />
+  Revert "Support xmlTextReaderNextSibling w/o preparsed doc" (Nick Wellnhofer),<br />
+  Fix building relative URIs (Thomas Holder),<br />
+  Problem with data in interleave in RelaxNG validation (Nikolai Weibull),<br />
+  Fix memory leak in xmlSwitchInputEncodingInt error path (Nick Wellnhofer),<br />
+  Set doc on element obtained from freeElems (Nick Wellnhofer),<br />
+  Fix HTML serialization with UTF-8 encoding (Nick Wellnhofer),<br />
+  Use actual doc in xmlTextReaderRead*Xml (Nick Wellnhofer),<br />
+  Unlink node before freeing it in xmlSAX2StartElement (Nick Wellnhofer),<br />
+  Check return value of nodePush in xmlSAX2StartElement (Nick Wellnhofer),<br />
+  Free input buffer in xmlHaltParser (Nick Wellnhofer),<br />
+  Reset HTML parser input pointers on encoding failure (Nick Wellnhofer),<br />
+  Don't run icu_parse_test if EUC-JP is unsupported (Nick Wellnhofer),<br />
+  Fix xmlSchemaValidCtxtPtr reuse memory leak (Greg Hildstrom),<br />
+  Fix xmlTextReaderNext with preparsed document (Felix Bünemann),<br />
+  Remove stray character from comment (Nick Wellnhofer),<br />
+  Remove a misleading line from xmlCharEncOutput (Andrey Bienkowski),<br />
+  HTML noscript should not close p (Daniel Veillard),<br />
+  Don't change context node in xmlXPathRoot (Nick Wellnhofer),<br />
+  Stop using XPATH_OP_RESET (Nick Wellnhofer),<br />
+  Revert "Change calls to xmlCharEncInput to set flush false" (Nick Wellnhofer)<br />
+  </li>
+
+  <li>Improvements:<br />
+  Fix "Problem with data in interleave in RelaxNG validation" (Nikolai Weibull),<br />
+  cleanup: remove some unreachable code (Thomas Holder),<br />
+  add --relative to testURI (Thomas Holder),<br />
+  Remove redefined starts and defines inside include elements (Nikolai Weibull),<br />
+  Allow choice within choice in nameClass in RELAX NG (Nikolai Weibull),<br />
+  Look inside divs for starts and defines inside include (Nikolai Weibull),<br />
+  Add compile and libxml2-config.cmake to .gitignore (Nikolai Weibull),<br />
+  Stop using doc-&gt;charset outside parser code (Nick Wellnhofer),<br />
+  Add newlines to 'xmllint --xpath' output (Nick Wellnhofer),<br />
+  Don't include SAX.h from globals.h (Nick Wellnhofer),<br />
+  Support xmlTextReaderNextSibling w/o preparsed doc (Felix Bünemann),<br />
+  Don't instruct user to run make when autogen.sh failed (林博仁(Buo-ren Lin)),<br />
+  Run Travis ASan tests with "sudo: required" (Nick Wellnhofer),<br />
+  Improve restoring of context size and position (Nick Wellnhofer),<br />
+  Simplify and harden nodeset filtering (Nick Wellnhofer),<br />
+  Avoid unnecessary backups of the context node (Nick Wellnhofer),<br />
+  Fix inconsistency in xmlXPathIsInf (Nick Wellnhofer)<br />
+  </li>
+
+  <li>Cleanups:<br />
+  </li>
+</ul><h3>v2.9.8: Mar 05 2018</h3><ul>
   <li>Portability:<br />
   python: remove single use of _PyVerify_fd (Patrick Welche),<br />
   Build more test executables on Windows/MSVC (Nick Wellnhofer),<br />
diff --git a/doc/xml.html b/doc/xml.html
index 4059fb7..53388a2 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -709,6 +709,73 @@
 
 <p>Here is the list of public releases:</p>
 
+<h3>v2.9.9: Jan 03 2019</h3>
+<ul>
+  <li>Security:<br/>
+  CVE-2018-9251 CVE-2018-14567 Fix infinite loop in LZMA decompression (Nick Wellnhofer),<br/>
+  CVE-2018-14404 Fix nullptr deref with XPath logic ops (Nick Wellnhofer),<br/>
+  </li>
+
+  <li>Documentation:<br/>
+  reader: Fix documentation comment (Mohammed Sadiq)<br/>
+  </li>
+
+  <li>Portability:<br/>
+  Fix MSVC build with lzma (Nick Wellnhofer),<br/>
+  Variables need 'extern' in static lib on Cygwin (Michael Haubenwallner),<br/>
+  Really declare dllexport/dllimport for Cygwin (Michael Haubenwallner),<br/>
+  Merge branch 'patch-2' into 'master' (Nick Wellnhofer),<br/>
+  Change dir to $THEDIR after ACLOCAL_PATH check autoreconf creates aclocal.m4 in $srcdir (Vitaly Buka),<br/>
+  Improve error message if pkg.m4 couldn't be found (Nick Wellnhofer),<br/>
+  NaN and Inf fixes for pre-C99 compilers (Nick Wellnhofer)<br/>
+  </li>
+
+  <li>Bug Fixes:<br/>
+  Revert "Support xmlTextReaderNextSibling w/o preparsed doc" (Nick Wellnhofer),<br/>
+  Fix building relative URIs (Thomas Holder),<br/>
+  Problem with data in interleave in RelaxNG validation (Nikolai Weibull),<br/>
+  Fix memory leak in xmlSwitchInputEncodingInt error path (Nick Wellnhofer),<br/>
+  Set doc on element obtained from freeElems (Nick Wellnhofer),<br/>
+  Fix HTML serialization with UTF-8 encoding (Nick Wellnhofer),<br/>
+  Use actual doc in xmlTextReaderRead*Xml (Nick Wellnhofer),<br/>
+  Unlink node before freeing it in xmlSAX2StartElement (Nick Wellnhofer),<br/>
+  Check return value of nodePush in xmlSAX2StartElement (Nick Wellnhofer),<br/>
+  Free input buffer in xmlHaltParser (Nick Wellnhofer),<br/>
+  Reset HTML parser input pointers on encoding failure (Nick Wellnhofer),<br/>
+  Don't run icu_parse_test if EUC-JP is unsupported (Nick Wellnhofer),<br/>
+  Fix xmlSchemaValidCtxtPtr reuse memory leak (Greg Hildstrom),<br/>
+  Fix xmlTextReaderNext with preparsed document (Felix Bünemann),<br/>
+  Remove stray character from comment (Nick Wellnhofer),<br/>
+  Remove a misleading line from xmlCharEncOutput (Andrey Bienkowski),<br/>
+  HTML noscript should not close p (Daniel Veillard),<br/>
+  Don't change context node in xmlXPathRoot (Nick Wellnhofer),<br/>
+  Stop using XPATH_OP_RESET (Nick Wellnhofer),<br/>
+  Revert "Change calls to xmlCharEncInput to set flush false" (Nick Wellnhofer)<br/>
+  </li>
+
+  <li>Improvements:<br/>
+  Fix "Problem with data in interleave in RelaxNG validation" (Nikolai Weibull),<br/>
+  cleanup: remove some unreachable code (Thomas Holder),<br/>
+  add --relative to testURI (Thomas Holder),<br/>
+  Remove redefined starts and defines inside include elements (Nikolai Weibull),<br/>
+  Allow choice within choice in nameClass in RELAX NG (Nikolai Weibull),<br/>
+  Look inside divs for starts and defines inside include (Nikolai Weibull),<br/>
+  Add compile and libxml2-config.cmake to .gitignore (Nikolai Weibull),<br/>
+  Stop using doc-&gt;charset outside parser code (Nick Wellnhofer),<br/>
+  Add newlines to 'xmllint --xpath' output (Nick Wellnhofer),<br/>
+  Don't include SAX.h from globals.h (Nick Wellnhofer),<br/>
+  Support xmlTextReaderNextSibling w/o preparsed doc (Felix Bünemann),<br/>
+  Don't instruct user to run make when autogen.sh failed (林博仁(Buo-ren Lin)),<br/>
+  Run Travis ASan tests with "sudo: required" (Nick Wellnhofer),<br/>
+  Improve restoring of context size and position (Nick Wellnhofer),<br/>
+  Simplify and harden nodeset filtering (Nick Wellnhofer),<br/>
+  Avoid unnecessary backups of the context node (Nick Wellnhofer),<br/>
+  Fix inconsistency in xmlXPathIsInf (Nick Wellnhofer)<br/>
+  </li>
+
+  <li>Cleanups:<br/>
+  </li>
+</ul>
 <h3>v2.9.8: Mar 05 2018</h3>
 <ul>
   <li>Portability:<br/>