diff --git a/Changelog.yaml b/Changelog.yaml
index 3fa661135c..e6d2033f7b 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -20,6 +20,26 @@
 #   new recipes:
 #     - title: 
 
+- version: 2.18.0
+  date: 2015-01-30
+
+  new features:
+    - title: "Edit Book: Add 'Style Classes' and 'Links' report pages to the Reports tool"
+
+    - title: "Tag browser: Allow expanding all children of a node by right clicking and choosing 'Expand All'"
+      tickets: [1414315]
+
+    - title: "Preferences: Re-arrange the controls to avoid needing to move the mouse from the top to the bottom of the dialog when closing the dialog after making some changes"
+
+  bug fixes:
+    - title: "Save to Disk: Fix a bug where when multiple books are being saved to disk, if the save to disk template results in identical filenames, the filenames were not being properly disambiguated."
+
+    - title: "Preferences: Use a dialog instead of a main window to workaround Qt's poor handling of full screen mode on OS X Yosemite."
+      tickets: [1414497]
+
+  improved recipes:
+    - Al Jazeera in English
+
 - version: 2.17.0
   date: 2015-01-23
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 4368deead1..76e21ec619 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (2, 17, 0)
+numeric_version = (2, 18, 0)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"