diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8946d9ac..bb192ab6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+### Changed
+
+### Fixed
+
+
+## [2.8.0] - 2016-08-04
+
+### Added
+
 - EWKT support.
 - Track `pop` type calls and queue underruns when `OSMIUM_DEBUG_QUEUE_SIZE`
   environment variable is set.
@@ -22,6 +31,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Uses less memory when writing PBF files (smaller string table by default).
 - Removes dependency on sparsehash and boost program options libraries for
   examples.
+- Cleaned up threaded queue code.
 
 ### Fixed
 
@@ -367,7 +377,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   Doxygen (up to version 1.8.8). This version contains a workaround to fix
   this.
 
-[unreleased]: https://github.com/osmcode/libosmium/compare/v2.7.2...HEAD
+[unreleased]: https://github.com/osmcode/libosmium/compare/v2.8.0...HEAD
+[2.8.0]: https://github.com/osmcode/libosmium/compare/v2.7.2...v2.8.0
 [2.7.2]: https://github.com/osmcode/libosmium/compare/v2.7.1...v2.7.2
 [2.7.1]: https://github.com/osmcode/libosmium/compare/v2.7.0...v2.7.1
 [2.7.0]: https://github.com/osmcode/libosmium/compare/v2.6.1...v2.7.0
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9961c6b9..c82cdd093 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,8 +24,8 @@ set(CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;MinSizeRel;Dev;Cover
 project(libosmium)
 
 set(LIBOSMIUM_VERSION_MAJOR 2)
-set(LIBOSMIUM_VERSION_MINOR 7)
-set(LIBOSMIUM_VERSION_PATCH 2)
+set(LIBOSMIUM_VERSION_MINOR 8)
+set(LIBOSMIUM_VERSION_PATCH 0)
 
 set(LIBOSMIUM_VERSION
     "${LIBOSMIUM_VERSION_MAJOR}.${LIBOSMIUM_VERSION_MINOR}.${LIBOSMIUM_VERSION_PATCH}")
diff --git a/include/osmium/version.hpp b/include/osmium/version.hpp
index 7ff931e6f..ac7a94fb3 100644
--- a/include/osmium/version.hpp
+++ b/include/osmium/version.hpp
@@ -34,9 +34,9 @@ DEALINGS IN THE SOFTWARE.
 */
 
 #define LIBOSMIUM_VERSION_MAJOR 2
-#define LIBOSMIUM_VERSION_MINOR 7
-#define LIBOSMIUM_VERSION_PATCH 2
+#define LIBOSMIUM_VERSION_MINOR 8
+#define LIBOSMIUM_VERSION_PATCH 0
 
-#define LIBOSMIUM_VERSION_STRING "2.7.2"
+#define LIBOSMIUM_VERSION_STRING "2.8.0"
 
 #endif // OSMIUM_VERSION_HPP