diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 1b3003aae..9a4813189 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-10  Corinna Vinschen  <corinna@vinschen.de>
+
+	* include/cygwin/version.h (CYGWIN_VERSION_DLL_MAJOR): Bump to 2000.
+	(CYGWIN_VERSION_DLL_MINOR): Set to 0.
+
 2015-04-04  Jon TURNEY  <jon.turney@dronecode.org.uk>
 
 	* exceptions.cc (call_signal_handler): Set mcontext.cr2 to the
diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
index 71d118e41..7734b120b 100644
--- a/winsup/cygwin/include/cygwin/version.h
+++ b/winsup/cygwin/include/cygwin/version.h
@@ -42,8 +42,8 @@ details. */
 	 the Cygwin shared library".  This version is used to track important
 	 changes to the DLL and is mainly informative in nature. */
 
-#define CYGWIN_VERSION_DLL_MAJOR 1007
-#define CYGWIN_VERSION_DLL_MINOR 36
+#define CYGWIN_VERSION_DLL_MAJOR 2000
+#define CYGWIN_VERSION_DLL_MINOR 0
 
       /* Major numbers before CYGWIN_VERSION_DLL_EPOCH are
 	 incompatible. */
diff --git a/winsup/cygwin/release/1.7.36 b/winsup/cygwin/release/2.0.0
similarity index 100%
rename from winsup/cygwin/release/1.7.36
rename to winsup/cygwin/release/2.0.0
diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 416390034..a0507a4c6 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-10  Corinna Vinschen  <corinna@vinschen.de>
+
+	* new-features.xml (ov-new2.0): Rename from ov-new1.7.36 and change
+	version number to 2.0.
+
 2015-04-02  David A. Wheeler  <dwheeler@dwheeler.com>
 
 	* faq-setup.xml: Document how Cygwin secures installation and
diff --git a/winsup/doc/new-features.xml b/winsup/doc/new-features.xml
index 3f8b967a7..2d0ed0b03 100644
--- a/winsup/doc/new-features.xml
+++ b/winsup/doc/new-features.xml
@@ -4,7 +4,7 @@
 
 <sect1 id="ov-new1.7"><title>What's new and what changed in Cygwin</title>
 
-<sect2 id="ov-new1.7.36"><title>What's new and what changed in 1.7.36</title>
+<sect2 id="ov-new2.0"><title>What's new and what changed in 2.0</title>
 
 <itemizedlist mark="bullet">