diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c361040f5..8eec9e2046 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Change Log
 
+## [2.5.0](https://github.com/swift-nav/libsbp/tree/v2.5.0)
+
+[Full Changelog](https://github.com/swift-nav/libsbp/compare/v2.4.10...v2.5.0)
+
+**Merged pull requests:**
+
+- Python 3 support
+- added virtualenv instructions for the python bindings for libsbp [\#654](https://github.com/swift-nav/libsbp/pull/654)
+- Updated CMake files [\#652](https://github.com/swift-nav/libsbp/pull/652)
+- Use twine/nix to push to PyPI, auto-mangle IS\_RELEASED \[ESD-1038\] [\#651](https://github.com/swift-nav/libsbp/pull/651)
+
 ## [v2.4.10](https://github.com/swift-nav/libsbp/tree/v2.4.10) (2019-02-14)
 [Full Changelog](https://github.com/swift-nav/libsbp/compare/v2.4.9...v2.4.10)
 
@@ -1409,4 +1420,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/HOWTO.md b/HOWTO.md
index fb75b305e0..2968eb8caa 100644
--- a/HOWTO.md
+++ b/HOWTO.md
@@ -92,8 +92,8 @@ Ubuntu 16.04.
 
    - Others: should be automatically extracted from git tag
 
-2. Add to RELEASE_NOTES.md and update the CHANGELOG details with `make
-   release`. Submit a pull request and get it merged. This requires
+2. Update the CHANGELOG details with `make release`. Submit a pull request and
+   get it merged. This requires
    [github-changelog-generator](https://github.com/skywinder/github-changelog-generator),
    and a `CHANGELOG_GITHUB_TOKEN` in your `PATH` if you don't already have
    them.
diff --git a/c/include/libsbp/version.h b/c/include/libsbp/version.h
index c207bd743d..75b072c06c 100644
--- a/c/include/libsbp/version.h
+++ b/c/include/libsbp/version.h
@@ -23,9 +23,9 @@
 /** Protocol major version. */
 #define SBP_MAJOR_VERSION 2
 /** Protocol minor version. */
-#define SBP_MINOR_VERSION 4
+#define SBP_MINOR_VERSION 5
 /** Protocol patch version. */
-#define SBP_PATCH_VERSION 10
+#define SBP_PATCH_VERSION 0
 
 /** \} */
 
diff --git a/default.nix b/default.nix
index 45bb957975..9cefca62ff 100644
--- a/default.nix
+++ b/default.nix
@@ -6,17 +6,20 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libiconv
     zlib
-    clang_5
+    clang_6
     check
     gradle
     zlib.dev
     ghc
     cabal-install
     python27Full
-    python27Packages.virtualenv
     python27Packages.setuptools
-    python27Packages.wheel
-    python27Packages.twine
+    python27Packages.virtualenv
+    python27Packages.pip
+    python37Full
+    python37Packages.setuptools
+    python27Packages.virtualenv
+    python37Packages.pip
     nodejs
     coreutils
     bash
@@ -28,5 +31,12 @@ stdenv.mkDerivation rec {
   ];
   shellHook = ''
     [[ -z "$SOURCE_DATE_EPOCH" ]] || unset SOURCE_DATE_EPOCH
+    rm -rf .dist.py2
+    rm -rf .dist.py3
+    virtualenv .dist.py2
+    virtualenv .dist.py3 --python=`which python3`
+    .dist.py2/bin/pip install --ignore-installed twine wheel virtualenv
+    .dist.py3/bin/pip install --ignore-installed twine wheel virtualenv
+    source .dist.py3/bin/activate
   '';
 }
diff --git a/docs/sbp.pdf b/docs/sbp.pdf
index 48f78bb021..36d4bf3169 100644
Binary files a/docs/sbp.pdf and b/docs/sbp.pdf differ
diff --git a/haskell/sbp.cabal.m4 b/haskell/sbp.cabal.m4
index db70314f53..25c9a203a6 100644
--- a/haskell/sbp.cabal.m4
+++ b/haskell/sbp.cabal.m4
@@ -1,5 +1,5 @@
 name:                  sbp
-version:               2.4.10
+version:               2.5.0
 synopsis:              SwiftNav's SBP Library
 homepage:              https://github.com/swift-nav/libsbp
 license:               LGPL-3
diff --git a/package-lock.json b/package-lock.json
index 79c06e49bc..db2ce90e45 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "sbp",
-  "version": "2.4.10",
+  "version": "2.5.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f2d9a10f14..170500c664 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sbp",
-  "version": "2.4.10",
+  "version": "2.5.0",
   "description": "libsbp bindings for JavaScript. More information here: http://swift-nav.github.io/libsbp/",
   "files": [
     "javascript/*",
diff --git a/python/sbp/RELEASE-VERSION b/python/sbp/RELEASE-VERSION
index a6c4b4a24a..437459cd94 100644
--- a/python/sbp/RELEASE-VERSION
+++ b/python/sbp/RELEASE-VERSION
@@ -1 +1 @@
-2.4.10
\ No newline at end of file
+2.5.0
diff --git a/python/tests/sbp/client/test_driver.py b/python/tests/sbp/client/test_driver.py
index dc1072566c..8f8d167859 100755
--- a/python/tests/sbp/client/test_driver.py
+++ b/python/tests/sbp/client/test_driver.py
@@ -30,7 +30,7 @@ class MockServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
   pass
 
 def tcp_server(handler):
-  server = MockServer(("localhost", 0), handler)
+  server = MockServer(("127.0.0.1", 0), handler)
   ip, port = server.server_address
   server_thread = threading.Thread(target=server.serve_forever)
   server_thread.daemon = True