diff --git a/CHANGELOG.md b/CHANGELOG.md
index d480b36d06..e45ee6d7f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,42 @@
 # Change Log
 
+## [v2.1.8](https://github.com/swift-nav/libsbp/tree/v2.1.8)
+
+[Full Changelog](https://github.com/swift-nav/libsbp/compare/v2.1.7...v2.1.8)
+
+**Merged pull requests:**
+
+- Split sbp\_process\(\) into two functions.  [\#444](https://github.com/swift-nav/libsbp/pull/444)
+- Add MsgAlmanacGps and MsgAlmanacGlo [\#441](https://github.com/swift-nav/libsbp/pull/441)
+- Pdf publish version fix [\#440](https://github.com/swift-nav/libsbp/pull/440)
+
+## [v2.1.7](https://github.com/swift-nav/libsbp/tree/v2.1.7) (2017-02-08)
+[Full Changelog](https://github.com/swift-nav/libsbp/compare/v2.1.6...v2.1.7)
+
+**Merged pull requests:**
+
+- Add src\_sid field into MSG\_NDB\_EVENT [\#439](https://github.com/swift-nav/libsbp/pull/439)
+- Rename member variable to avoid name collision [\#438](https://github.com/swift-nav/libsbp/pull/438)
+- Add MSG\_NDB\_EVENT [\#436](https://github.com/swift-nav/libsbp/pull/436)
+- Remove filename - use filehandles [\#435](https://github.com/swift-nav/libsbp/pull/435)
+
+## [v2.1.6](https://github.com/swift-nav/libsbp/tree/v2.1.6) (2017-01-25)
+[Full Changelog](https://github.com/swift-nav/libsbp/compare/v2.1.5...v2.1.6)
+
+**Merged pull requests:**
+
+- Fix UTC flags [\#432](https://github.com/swift-nav/libsbp/pull/432)
+- Pass reason with underlying client connection warnings. [\#431](https://github.com/swift-nav/libsbp/pull/431)
+- make handler callable threadsafe, Catch pyserial writeTimeoutErrors [\#430](https://github.com/swift-nav/libsbp/pull/430)
+- Accuracy fields implemented in SPP [\#429](https://github.com/swift-nav/libsbp/pull/429)
+- Change description for msg\_tracking\_state\_detailed\_t.lock [\#427](https://github.com/swift-nav/libsbp/pull/427)
+
 ## [v2.1.5](https://github.com/swift-nav/libsbp/tree/v2.1.5) (2017-01-04)
 [Full Changelog](https://github.com/swift-nav/libsbp/compare/v2.1.4...v2.1.5)
 
 **Merged pull requests:**
 
+- V2.1.5 branch [\#426](https://github.com/swift-nav/libsbp/pull/426)
 - add CDC driver [\#425](https://github.com/swift-nav/libsbp/pull/425)
 
 ## [v2.1.4](https://github.com/swift-nav/libsbp/tree/v2.1.4) (2016-12-13)
@@ -919,4 +951,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\ No newline at end of file
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 83ae766166..046ffdf44c 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -6,6 +6,9 @@ For a detailed index of changes, please see the
 
 Contents
 --------
+ * [v2.1.8](#v2.1.8)
+ * [v2.1.7](#v2.1.7)
+ * [v2.1.6](#v2.1.6)
  * [v2.1.5](#v2.1.5)
  * [v2.1.0](#v2.1.0)
  * [v2.0.0](#v2.0.0)
@@ -16,6 +19,20 @@ Contents
  * [v0.39](#v0.39)
  * [v0.33](#v0.33)
 
+v2.1.8 <a name="v2.1.8">
+--------------------------
+* Add MSG_ALMANAC_GPS (0x70)
+* Add MSG_ALMANC_GLO (0x71)
+
+v2.1.7 <a name="v2.1.7">
+--------------------------
+* python client improvments (threadsafe write)
+* Python network driver improvements (verbosity in connection issues)
+
+v2.1.6 <a name="v2.1.6">
+--------------------------
+* Add MSG_NDB_EVENT
+
 v2.1.5 <a name="v2.1.5">
 --------------------------
 * Add CDC driver for usb CDC AMC devices
diff --git a/docs/sbp.pdf b/docs/sbp.pdf
index bc170e9f88..9895e77d29 100644
Binary files a/docs/sbp.pdf and b/docs/sbp.pdf differ
diff --git a/haskell/sbp.cabal b/haskell/sbp.cabal
index 98339f7995..dacbec2703 100644
--- a/haskell/sbp.cabal
+++ b/haskell/sbp.cabal
@@ -1,5 +1,5 @@
 name:                  sbp
-version:               2.1.7
+version:               2.1.8
 synopsis:              SwiftNav's SBP Library
 homepage:              https://github.com/swift-nav/libsbp
 license:               LGPL-3
diff --git a/package.json b/package.json
index 0d731e9d8b..361d77791c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "libsbp",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "description": "libsbp bindings for JavaScript. More information here: http://swift-nav.github.io/libsbp/",
   "files": [
     "javascript/*",