diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1766aa21d..15464b1d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,42 @@
+0.36.0
+------
+
+    Bug #923: Editor: Operations-Multithreading is broken
+    Bug #1317: Erene Llenim in Seyda Neen does not walk around
+    Bug #1621: "Error Detecting Morrowind Installation" in the default directory
+    Bug #2216: Creating a clone of the player stops you moving.
+    Bug #2387: Casting bound weapon spell doesn't switch to "ready weapon" mode
+    Bug #2407: Default to (0, 0) when "unknown cell" is encountered.
+    Bug #2411: enchanted item charges don't update/refresh if spell list window is pinned open
+    Bug #2428: Editor: cloning / creating new container class results in invalid omwaddon file - openmw-0.35
+    Bug #2429: Editor - cloning omits some values or sets different values than the original has
+    Bug #2430: NPC with negative fatigue don't fall (LGNPC Vivec, Foreign Quarter v2.21)
+    Bug #2432: Error on startup with Uvirith's Legacy enabled
+    Bug #2435: Editor: changed entries in the objects window are not shown as such
+    Bug #2437: Editor: changing an entry of a container/NPC/clothing/ingredient/globals will not be saved in the omwaddon file
+    Bug #2447: Editor doesn't save terrain information
+    Bug #2451: Editor not listing files with accented characters
+    Bug #2453: Chargen: sex, race and hair sliders not initialized properly
+    Bug #2459: Minor terrain clipping through statics due to difference in triangle alignment
+    Bug #2461: Invisible sound mark has collision in Sandus Ancestral Tomb
+    Bug #2465: tainted gold stack
+    Bug #2475: cumulative stacks of 100 point fortify skill speechcraft boosts do not apply correctly
+    Bug #2498: Editor: crash when issuing undo command after the table subview is closed
+    Bug #2500: Editor: object table - can't undo delete record
+    Feature #139: Editor: Global Search & Replace
+    Feature #1219: Editor: Add dialogue mode only columns
+    Feature #2024: Hotkey for hand to hand (i.e. unequip any weapon)
+    Feature #2119: "Always Sneak" key bind
+    Feature #2262: Editor: Handle moved instances
+    Feature #2425: Editor: Add start script table
+    Feature #2426: Editor: start script record verifier
+    Feature #2480: Launcher: Multiselect entries in the Data Files list
+    Feature #2505: Editor: optionally show a line number column in the script editor
+    Feature #2512: Editor: Offer use of monospace fonts in the script editor as an option
+    Feature #2514: Editor: focus on ID input field on clone/add
+    Task #2460: OS X: Use Application Support directory as user data path
+    Task #2516: Editor: Change References / Referenceables terminology
+
 0.35.1
 ------
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 07fffd577..7c19c57eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,8 +19,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
 message(STATUS "Configuring OpenMW...")
 
 set(OPENMW_VERSION_MAJOR 0)
-set(OPENMW_VERSION_MINOR 35)
-set(OPENMW_VERSION_RELEASE 1)
+set(OPENMW_VERSION_MINOR 36)
+set(OPENMW_VERSION_RELEASE 0)
 
 set(OPENMW_VERSION_COMMITHASH "")
 set(OPENMW_VERSION_TAGHASH "")
diff --git a/README.md b/README.md
index 811eb8763..f62800e1f 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ OpenMW
 OpenMW is an attempt at recreating the engine for the popular role-playing game
 Morrowind by Bethesda Softworks. You need to own and install the original game for OpenMW to work.
 
-* Version: 0.35.1
+* Version: 0.36.0
 * License: GPL (see docs/license/GPL3.txt for more information)
 * Website: http://www.openmw.org
 * IRC: #openmw on irc.freenode.net