diff --git a/CHANGELOG b/CHANGELOG
index 3c91c31b..f0648ebc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,5 @@
 
-Development version (next release)
+Version 0.6.0
 - Added support for MSVC (Visual Studio) 2015
 - Added tuned parameters for various devices (see README)
 - Now automatically generates C++ code from JSON tuning results
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 508dad72..d26a2843 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@
 cmake_minimum_required(VERSION 2.8.10)
 project("clblast" C CXX)
 set(clblast_VERSION_MAJOR 0)
-set(clblast_VERSION_MINOR 5)
+set(clblast_VERSION_MINOR 6)
 set(clblast_VERSION_PATCH 0)
 
 # Options and their default values