diff --git a/CODING b/CODING
index ec9e28e..9914d21 100644
--- a/CODING
+++ b/CODING
@@ -98,6 +98,7 @@ Tips
 Release process instructions
 ============================
 
+* use "api_coverage.py --python elementary" to see the missing bindings
 * Announce at enlightenment-release@lists.sourceforge.net and
   enlightenment-devel@lists.sourceforge.net that you are planning for the release
 * Change versions in efl/__init__.py (ex: 1.9.0)
diff --git a/ChangeLog b/ChangeLog
index e242357..312138a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,50 @@
 
+===================
+2016-08-22  v1.18.0
+===================
+
+Fixes:
+ * Fixed (workaround) dbus crash on python >= 3.5
+ * Fixed Logger module to not fail on unicode error messages
+
+Changes:
+ * Changed enums implementation to gain compatibility with Cython > 0.22
+ * Docs: Allow to skip last_updated and sphinx_version
+ * elm.Combobox: The combobox widget has been deprecated.
+ * elm.Photo.editable property is now also readable
+ * elm.Photo.fill_inside property is now also readable
+ * elm.Photo.size property is now also readable
+
+Additions:
+ * ecore.Exe.is_deleted 
+ * ecore.FdHandler.is_deleted
+ * edje.Edje.part_box_insert_after
+ * elm.Configuration.accel_preference_override
+ * elm.Configuration.first_item_focus_on_first_focusin
+ * elm.Configuration.font_hint_type
+ * elm.Configuration.icon_theme
+ * elm.Configuration.popup_scrollable
+ * elm.Configuration.scroll_accel_factor
+ * elm.Configuration.scroll_animation_disabled
+ * elm.Configuration.vsync
+ * elm.Configuration.web_backend
+ * elm.Entry.file_text_format
+ * elm.Entry.select_allow
+ * elm.Entry.select_region
+ * elm.GengridItem.all_contents_unset
+ * elm.Genlist.filtered_items_count
+ * elm.GenlistItem.all_contents_unset
+ * elm.List.multi_select_mode (and the Elm_Object_Multi_Select_Mode enum)
+ * elm.Object.focus_move_policy_automatic
+ * elm.Popup.align
+ * elm.Popup.scrollable
+ * elm.Slider.range
+ * elm.Slider.range_enabled
+ * elm.Slider.indicator_show_on_focus
+ * elm.Transit.revert
+ * elm.Window.noblank
+
+
 ==================
 2016-01-7  v1.17.0
 ==================
diff --git a/efl/__init__.py b/efl/__init__.py
index fdad3f0..6452792 100644
--- a/efl/__init__.py
+++ b/efl/__init__.py
@@ -20,5 +20,5 @@
 # pre-release: "1.13.0-beta1" ( 1, 13, 0 )
 # release:     "1.13.0" ( 1, 13, 0 )
 
-__version__ = "1.17.99"
-__version_info__ = ( 1, 17, 99 )
+__version__ = "1.18.0"
+__version_info__ = ( 1, 18, 0 )
diff --git a/efl/elementary/entry.pxi b/efl/elementary/entry.pxi
index b079f56..92f90e6 100644
--- a/efl/elementary/entry.pxi
+++ b/efl/elementary/entry.pxi
@@ -650,7 +650,7 @@ cdef class Entry(LayoutClass):
 
         :type: 2 ints tuple (start, end)
 
-        .. versionadded: 1.18
+        .. versionadded:: 1.18
 
         """
         def __get__(self):
@@ -670,7 +670,7 @@ cdef class Entry(LayoutClass):
         :param end: The ending position
         :type end: int
 
-        .. versionadded: 1.9
+        .. versionadded:: 1.9
 
         """
         elm_entry_select_region_set(self.obj, start, end)
@@ -680,7 +680,7 @@ cdef class Entry(LayoutClass):
         :return: the 2 ints tuple (start, end)
         :rtype: tuple
 
-        .. versionadded: 1.18
+        .. versionadded:: 1.18
 
         """
         cdef int start, end
diff --git a/efl/elementary/slider.pxi b/efl/elementary/slider.pxi
index 28b46bd..05a18e2 100644
--- a/efl/elementary/slider.pxi
+++ b/efl/elementary/slider.pxi
@@ -368,7 +368,7 @@ cdef class Slider(LayoutClass):
 
         :type: bool
 
-        .. versionadded: 1.18
+        .. versionadded:: 1.18
 
         """
         def __get__(self):