diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc9a5ec6b..e426ffd51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Change Log
 
+## [1.2](https://github.com/krivenko/som/tree/1.2) (2020-03-15)
+[Full Changelog](https://github.com/krivenko/som/compare/1.1...1.2)
+
+- Improvements and small fixes in documentation.
+- Added a new histogram post-processing function, `count_good_solutions()`.
+- Fixed a bug in `update_glue_shift` elementary update.
+- New benchmark `all_kernels` and fixes in the `chi` benchmark.
+- Added Travis CI config for continuous testing and documentation deployment.
+- Minor code improvements.
+
 ## [1.1](https://github.com/krivenko/som/tree/1.1) (2017-04-23)
 [Full Changelog](https://github.com/krivenko/som/compare/1.0...1.1)
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c3e2c1e7..10290b9c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ if(NOT CMAKE_BUILD_TYPE)
 endif(NOT CMAKE_BUILD_TYPE)
 
 # Version number of the application
-set(SOM_VERSION "1.1")
+set(SOM_VERSION "1.2")
 message(STATUS "Configuring SOM version ${SOM_VERSION}")
 
 # Append triqs installed files to the cmake load path