diff --git a/configure.ac b/configure.ac
index c0c90d7..8dbc56c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@
 
 LIBXML_MAJOR_VERSION=2
 LIBXML_MINOR_VERSION=9
-LIBXML_MICRO_VERSION=6
+LIBXML_MICRO_VERSION=7
 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 25ff51d..f575ff0 100644
--- a/doc/libxml2.xsa
+++ b/doc/libxml2.xsa
@@ -8,125 +8,24 @@
   </vendor>
   <product id="libxml2">
     <name>libxml2</name>
-    <version>v2.9.5</version>
-    <last-release> Sep 04 2017</last-release>
+    <version>v2.9.6</version>
+    <last-release> Oct 06 2017</last-release>
     <info-url>http://xmlsoft.org/</info-url>
-    <changes>   - Security:
-  Detect infinite recursion in parameter entities (Nick Wellnhofer),
-  Fix handling of parameter-entity references (Nick Wellnhofer),
-  Disallow namespace nodes in XPointer ranges (Nick Wellnhofer),
-  Fix XPointer paths beginning with range-to (Nick Wellnhofer)
-  
-   - Documentation:
-  Documentation fixes (Nick Wellnhofer),
-  Spelling and grammar fixes (Nick Wellnhofer)
-  
-   - Portability:
-  Adding README.zOS to list of extra files for the release (Daniel Veillard),
-  Description of work needed to compile on zOS (Stéphane Michaut),
-  Porting libxml2 on zOS encoding of code (Stéphane Michaut),
-  small changes for OS/400 (Patrick Monnerat),
-  relaxng.c, xmlschemas.c: Fix build on pre-C99 compilers (Chun-wei Fan)
+    <changes>   - Portability:
+  Change preprocessor OS tests to __linux__ (Nick Wellnhofer)
   
    - Bug Fixes:
-  Problem resolving relative URIs (Daniel Veillard),
-  Fix unwanted warnings when switching encodings (Nick Wellnhofer),
-  Fix signature of xmlSchemaAugmentImportedIDC (Daniel Veillard),
-  Heap-buffer-overflow read of size 1 in xmlFAParsePosCharGroup (David Kilzer),
-  Fix NULL pointer deref in xmlFAParseCharClassEsc (Nick Wellnhofer),
-  Fix infinite loops with push parser in recovery mode (Nick Wellnhofer),
-  Send xmllint usage error to stderr (Nick Wellnhofer),
-  Fix NULL deref in xmlParseExternalEntityPrivate (Nick Wellnhofer),
-  Make sure not to call IS_BLANK_CH when parsing the DTD (Nick Wellnhofer),
-  Fix xmlHaltParser (Nick Wellnhofer),
-  Fix pathological performance when outputting charrefs (Nick Wellnhofer),
-  Fix invalid-source-encoding warnings in testWriter.c (Nick Wellnhofer),
-  Fix duplicate SAX callbacks for entity content (David Kilzer),
-  Treat URIs with scheme as absolute in C14N (Nick Wellnhofer),
-  Fix copy-paste errors in error messages (Nick Wellnhofer),
-  Fix sanity check in htmlParseNameComplex (Nick Wellnhofer),
-  Fix potential infinite loop in xmlStringLenDecodeEntities (Nick Wellnhofer),
-  Reset parser input pointers on encoding failure (Nick Wellnhofer),
-  Fix memory leak in xmlParseEntityDecl error path (Nick Wellnhofer),
-  Fix xmlBuildRelativeURI for URIs starting with './' (Nick Wellnhofer),
-  Fix type confusion in xmlValidateOneNamespace (Nick Wellnhofer),
-  Fix memory leak in xmlStringLenGetNodeList (Nick Wellnhofer),
-  Fix NULL pointer deref in xmlDumpElementContent (Daniel Veillard),
-  Fix memory leak in xmlBufAttrSerializeTxtContent (Nick Wellnhofer),
-  Stop parser on unsupported encodings (Nick Wellnhofer),
-  Check for integer overflow in memory debug code (Nick Wellnhofer),
-  Fix buffer size checks in xmlSnprintfElementContent (Nick Wellnhofer),
-  Avoid reparsing in xmlParseStartTag2 (Nick Wellnhofer),
-  Fix undefined behavior in xmlRegExecPushStringInternal (Nick Wellnhofer),
-  Check XPath exponents for overflow (Nick Wellnhofer),
-  Check for overflow in xmlXPathIsPositionalPredicate (Nick Wellnhofer),
-  Fix spurious error message (Nick Wellnhofer),
-  Fix memory leak in xmlCanonicPath (Nick Wellnhofer),
-  Fix memory leak in xmlXPathCompareNodeSetValue (Nick Wellnhofer),
-  Fix memory leak in pattern error path (Nick Wellnhofer),
-  Fix memory leak in parser error path (Nick Wellnhofer),
-  Fix memory leaks in XPointer error paths (Nick Wellnhofer),
-  Fix memory leak in xmlXPathNodeSetMergeAndClear (Nick Wellnhofer),
-  Fix memory leak in XPath filter optimizations (Nick Wellnhofer),
-  Fix memory leaks in XPath error paths (Nick Wellnhofer),
-  Do not leak the new CData node if adding fails (David Tardon),
-  Prevent unwanted external entity reference (Neel Mehta),
-  Increase buffer space for port in HTTP redirect support (Daniel Veillard),
-  Fix more NULL pointer derefs in xpointer.c (Nick Wellnhofer),
-  Avoid function/data pointer conversion in xpath.c (Nick Wellnhofer),
-  Fix format string warnings (Nick Wellnhofer),
-  Disallow namespace nodes in XPointer points (Nick Wellnhofer),
-  Fix comparison with root node in xmlXPathCmpNodes (Nick Wellnhofer),
-  Fix attribute decoding during XML schema validation (Alex Henrie),
-  Fix NULL pointer deref in XPointer range-to (Nick Wellnhofer)
-  
-   - Improvements:
-  Updating the spec file to reflect Fedora 24 (Daniel Veillard),
-  Add const in five places to move 1 KiB to .rdata (Bruce Dawson),
-  Fix missing part of comment for function xmlXPathEvalExpression() (Daniel Veillard),
-  Get rid of "blanks wrapper" for parameter entities (Nick Wellnhofer),
-  Simplify handling of parameter entity references (Nick Wellnhofer),
-  Deduplicate code in encoding.c (Nick Wellnhofer),
-  Make HTML parser functions take const pointers (Nick Wellnhofer),
-  Build test programs only when needed (Nick Wellnhofer),
-  Fix doc/examples/index.py (Nick Wellnhofer),
-  Fix compiler warnings in threads.c (Nick Wellnhofer),
-  Fix empty-body warning in nanohttp.c (Nick Wellnhofer),
-  Fix cast-align warnings (Nick Wellnhofer),
-  Fix unused-parameter warnings (Nick Wellnhofer),
-  Rework entity boundary checks (Nick Wellnhofer),
-  Don't switch encoding for internal parameter entities (Nick Wellnhofer),
-  Merge duplicate code paths handling PE references (Nick Wellnhofer),
-  Test SAX2 callbacks with entity substitution (Nick Wellnhofer),
-  Support catalog and threads tests under --without-sax1 (Nick Wellnhofer),
-  Misc fixes for 'make tests' (Nick Wellnhofer),
-  Initialize keepBlanks in HTML parser (Nick Wellnhofer),
-  Add test cases for bug 758518 (David Kilzer),
-  Fix compiler warning in htmlParseElementInternal (Nick Wellnhofer),
-  Remove useless check in xmlParseAttributeListDecl (Nick Wellnhofer),
-  Allow zero sized memory input buffers (Nick Wellnhofer),
-  Add TODO comment in xmlSwitchEncoding (Nick Wellnhofer),
-  Check for integer overflow in xmlXPathFormatNumber (Nick Wellnhofer),
-  Make Travis print UBSan stacktraces (Nick Wellnhofer),
-  Add .travis.yml (Nick Wellnhofer),
-  Fix expected error output in Python tests (Nick Wellnhofer),
-  Simplify control flow in xmlParseStartTag2 (Nick Wellnhofer),
-  Disable LeakSanitizer when running API tests (Nick Wellnhofer),
-  Avoid out-of-bound array access in API tests (Nick Wellnhofer),
-  Avoid spurious UBSan errors in parser.c (Nick Wellnhofer),
-  Parse small XPath numbers more accurately (Nick Wellnhofer),
-  Rework XPath rounding functions (Nick Wellnhofer),
-  Fix white space in test output (Nick Wellnhofer),
-  Fix axis traversal from attribute and namespace nodes (Nick Wellnhofer),
-  Check for trailing characters in XPath expressions earlier (Nick Wellnhofer),
-  Rework final handling of XPath results (Nick Wellnhofer),
-  Make xmlXPathEvalExpression call xmlXPathEval (Nick Wellnhofer),
-  Remove unused variables (Nick Wellnhofer),
-  Don't print generic error messages in XPath tests (Nick Wellnhofer)
-  
-   - Cleanups:
-  Fix a couple of misleading indentation errors (Daniel Veillard),
-  Remove unnecessary calls to xmlPopInput (Nick Wellnhofer)
+  Fix XPath stack frame logic (Nick Wellnhofer),
+  Report undefined XPath variable error message (Nick Wellnhofer),
+  Fix regression with librsvg (Nick Wellnhofer),
+  Handle more invalid entity values in recovery mode (Nick Wellnhofer),
+  Fix structured validation errors (Nick Wellnhofer),
+  Fix memory leak in LZMA decompressor (Nick Wellnhofer),
+  Set memory limit for LZMA decompression (Nick Wellnhofer),
+  Handle illegal entity values in recovery mode (Nick Wellnhofer),
+  Fix debug dump of streaming XPath expressions (Nick Wellnhofer),
+  Fix memory leak in nanoftp (Nick Wellnhofer),
+  Fix memory leaks in SAX1 parser (Nick Wellnhofer)
   
 
 </changes>
diff --git a/doc/news.html b/doc/news.html
index 9a1d3e3..5346d32 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -8,7 +8,49 @@
 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.6: Oct 06 2017</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>2.9.7: Nov 02 2017</h3><ul>
+  <li>Documentation:<br />
+  xmlcatalog: refresh man page wrt. quering system catalog easily (Jan Pokorný)<br />
+  </li>
+
+  <li>Portability:<br />
+  Fix deprecated Travis compiler flag (Nick Wellnhofer),<br />
+  Add declaration for DllMain (J. Peter Mugaas),<br />
+  Fix preprocessor conditional in threads.h (J. Peter Mugaas),<br />
+  Fix pointer comparison warnings on 64-bit Windows (J. Peter Mugaas),<br />
+  Fix macro redefinition warning (J. Peter Mugaas),<br />
+  Default to native threads on MinGW-w64 (Nick Wellnhofer),<br />
+  Simplify Windows IO functions (Nick Wellnhofer),<br />
+  Fix runtest on Windows (Nick Wellnhofer),<br />
+  socklen_t is always int on Windows (Nick Wellnhofer),<br />
+  Don't redefine socket error codes on Windows (Nick Wellnhofer),<br />
+  Fix pointer/int cast warnings on 64-bit Windows (Nick Wellnhofer),<br />
+  Fix Windows compiler warnings in xmlCanonicPath (Nick Wellnhofer)<br />
+  </li>
+
+  <li>Bug Fixes:<br />
+  xmlcatalog: restore ability to query system catalog easily (Jan Pokorný),<br />
+  Fix comparison of nodesets to strings (Nick Wellnhofer)<br />
+  </li>
+
+  <li>Improvements:<br />
+  Add Makefile rules to rebuild HTML man pages (Nick Wellnhofer),<br />
+  Fix mixed decls and code in timsort.h (Nick Wellnhofer),<br />
+  Rework handling of return values in thread tests (Nick Wellnhofer),<br />
+  Fix unused variable warnings in testrecurse (Nick Wellnhofer),<br />
+  Fix -Wimplicit-fallthrough warnings (J. Peter Mugaas),<br />
+  Upgrade timsort.h to latest revision (Nick Wellnhofer),<br />
+  Increase warning level to /W3 under MSVC (Nick Wellnhofer),<br />
+  Fix a couple of warnings in dict.c and threads.c (Nick Wellnhofer),<br />
+  Update .gitignore for Windows (Nick Wellnhofer),<br />
+  Fix unused variable warnings in nanohttp.c (Nick Wellnhofer),<br />
+  Fix the Windows header mess (Nick Wellnhofer),<br />
+  Don't include winsock2.h in xmllint.c (Nick Wellnhofer),<br />
+  Remove generated file python/setup.py from version control (Nick Wellnhofer),<br />
+  Use __linux__ macro in generated code (Nick Wellnhofer)<br />
+  </li>
+
+</ul><h3>v2.9.6: Oct 06 2017</h3><ul>
   <li>Portability:<br />
   Change preprocessor OS tests to __linux__ (Nick Wellnhofer)<br />
   </li>
diff --git a/doc/xml.html b/doc/xml.html
index 019b5be..b902869 100644
--- a/doc/xml.html
+++ b/doc/xml.html
@@ -709,6 +709,50 @@
 
 <p>Here is the list of public releases:</p>
 
+<h3>2.9.7: Nov 02 2017</h3>
+<ul>
+  <li>Documentation:<br/>
+  xmlcatalog: refresh man page wrt. quering system catalog easily (Jan Pokorný)<br/>
+  </li>
+
+  <li>Portability:<br/>
+  Fix deprecated Travis compiler flag (Nick Wellnhofer),<br/>
+  Add declaration for DllMain (J. Peter Mugaas),<br/>
+  Fix preprocessor conditional in threads.h (J. Peter Mugaas),<br/>
+  Fix pointer comparison warnings on 64-bit Windows (J. Peter Mugaas),<br/>
+  Fix macro redefinition warning (J. Peter Mugaas),<br/>
+  Default to native threads on MinGW-w64 (Nick Wellnhofer),<br/>
+  Simplify Windows IO functions (Nick Wellnhofer),<br/>
+  Fix runtest on Windows (Nick Wellnhofer),<br/>
+  socklen_t is always int on Windows (Nick Wellnhofer),<br/>
+  Don't redefine socket error codes on Windows (Nick Wellnhofer),<br/>
+  Fix pointer/int cast warnings on 64-bit Windows (Nick Wellnhofer),<br/>
+  Fix Windows compiler warnings in xmlCanonicPath (Nick Wellnhofer)<br/>
+  </li>
+
+  <li>Bug Fixes:<br/>
+  xmlcatalog: restore ability to query system catalog easily (Jan Pokorný),<br/>
+  Fix comparison of nodesets to strings (Nick Wellnhofer)<br/>
+  </li>
+
+  <li>Improvements:<br/>
+  Add Makefile rules to rebuild HTML man pages (Nick Wellnhofer),<br/>
+  Fix mixed decls and code in timsort.h (Nick Wellnhofer),<br/>
+  Rework handling of return values in thread tests (Nick Wellnhofer),<br/>
+  Fix unused variable warnings in testrecurse (Nick Wellnhofer),<br/>
+  Fix -Wimplicit-fallthrough warnings (J. Peter Mugaas),<br/>
+  Upgrade timsort.h to latest revision (Nick Wellnhofer),<br/>
+  Increase warning level to /W3 under MSVC (Nick Wellnhofer),<br/>
+  Fix a couple of warnings in dict.c and threads.c (Nick Wellnhofer),<br/>
+  Update .gitignore for Windows (Nick Wellnhofer),<br/>
+  Fix unused variable warnings in nanohttp.c (Nick Wellnhofer),<br/>
+  Fix the Windows header mess (Nick Wellnhofer),<br/>
+  Don't include winsock2.h in xmllint.c (Nick Wellnhofer),<br/>
+  Remove generated file python/setup.py from version control (Nick Wellnhofer),<br/>
+  Use __linux__ macro in generated code (Nick Wellnhofer)<br/>
+  </li>
+
+</ul>
 <h3>v2.9.6: Oct 06 2017</h3>
 <ul>
   <li>Portability:<br/>
diff --git a/doc/xmlcatalog.1 b/doc/xmlcatalog.1
index 432a32a..2fbfaf2 100644
--- a/doc/xmlcatalog.1
+++ b/doc/xmlcatalog.1
@@ -1,7 +1,7 @@
 '\" t
 .\"     Title: xmlcatalog
 .\"    Author: John Fleck <jfleck@inkstain.net>
-.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
 .\"      Date: $Date$
 .\"    Manual: xmlcatalog Manual
 .\"    Source: libxml2
diff --git a/doc/xmlcatalog_man.html b/doc/xmlcatalog_man.html
index b488d5c..f72cd47 100644
--- a/doc/xmlcatalog_man.html
+++ b/doc/xmlcatalog_man.html
@@ -1,4 +1,4 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>xmlcatalog</title><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry"><a name="idm1"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>xmlcatalog &#8212; 
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>xmlcatalog</title><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry"><a name="idm45940765506544"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>xmlcatalog &#8212; 
 		Command line tool to parse and manipulate <acronym class="acronym">XML</acronym>
 		or <acronym class="acronym">SGML</acronym> catalog files.
 	</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">xmlcatalog</code>  [ <code class="option">--sgml</code>  |   <code class="option">--shell</code>  |   <code class="option">--create</code>  |   <code class="option">--del <em class="replaceable"><code>VALUE(S)</code></em></code>  |