diff --git a/Makefile b/Makefile
index d5979e9..7e568cc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # cartodb/Makefile
 
 EXTENSION = cartodb
-EXTVERSION = 0.17.1
+EXTVERSION = 0.18.0
 
 SED = sed
 
@@ -73,6 +73,7 @@ UPGRADABLE = \
   0.16.4 \
   0.17.0 \
   0.17.1 \
+  0.18.0 \
   $(EXTVERSION)dev \
   $(EXTVERSION)next \
   $(END)
diff --git a/NEWS.md b/NEWS.md
index f94c031..b721c4f 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,11 @@
+0.18.0 (2016-10-17)
+-------------------
+
+* Fix: exclude NULL geometries when creating Overviews #269
+* Function to check analysis tables limits #279
+* Exclude analysis cache tables from the quota #281
+
+
 0.17.1 (2016-08-16)
 -------------------