diff --git a/CMakeLists.txt b/CMakeLists.txt
index e314319c..f2e871e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ ENABLE_TESTING()
 
 SET(CPACK_PACKAGE_VERSION_MAJOR 1)
 SET(CPACK_PACKAGE_VERSION_MINOR 4)
-SET(CPACK_PACKAGE_VERSION_PATCH 35)
+SET(CPACK_PACKAGE_VERSION_PATCH 36)
 SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 
 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
diff --git a/NEWS b/NEWS
index 9f4c04ad..b9bd48fc 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,10 @@
 NEWS
 ====
 
-- 1.4.35
+- 1.4.36
+  *
+
+- 1.4.35 - 2014-03-12
   * [network/ssl] fix build error if TLSEXT is disabled
   * [mod_fastcgi] fix use after free (only triggered if fastcgi debug is active)
   * [mod_rrdtool] fix invalid read (string not null terminated)
@@ -23,7 +26,7 @@ NEWS
   * check length of unix domain socket filenames
   * fix SQL injection / host name validation (thx Jann Horn)
 
-- 1.4.34
+- 1.4.34 - 2014-01-20
   * [mod_auth] explicitly link ssl for SHA1 (fixes #2517)
   * [mod_extforward] fix compilation without IPv6, (not) using undefined var (fixes #2515, thx mm)
   * [ssl] fix SNI handling; only use key+cert from SNI specific config (fixes #2525, CVE-2013-4508)
diff --git a/SConstruct b/SConstruct
index cb2a58fb..d8bd98ac 100644
--- a/SConstruct
+++ b/SConstruct
@@ -5,7 +5,7 @@ import string
 from stat import *
 
 package = 'lighttpd'
-version = '1.4.35'
+version = '1.4.36'
 
 def checkCHeaders(autoconf, hdrs):
 	p = re.compile('[^A-Z0-9]')
diff --git a/configure.ac b/configure.ac
index 682023b4..ae352346 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl                                               -*- Autoconf -*-
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.57)
-AC_INIT([lighttpd], [1.4.35], [contact@lighttpd.net])
+AC_INIT([lighttpd], [1.4.36], [contact@lighttpd.net])
 AC_CONFIG_SRCDIR([src/server.c])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])