diff --git a/NEWS.md b/NEWS.md
index 9a18d346..ccb90b60 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,8 +1,11 @@
 # Changelog
 
-## 3.5.2
+## 3.6.0
 Released 2017-mm-dd
 
+Announcements:
+ - Upgrades camshaft to [0.54.0](https://github.com/CartoDB/camshaft/releases/tag/0.54.0).
+
 
 ## 3.5.1
 Released 2017-04-11
diff --git a/package.json b/package.json
index 4a3003ba..9a7c5dd0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "windshaft-cartodb",
-  "version": "3.5.2",
+  "version": "3.6.0",
   "description": "A map tile server for CartoDB",
   "keywords": [
     "cartodb"
@@ -20,7 +20,7 @@
   ],
   "dependencies": {
     "body-parser": "~1.14.0",
-    "camshaft": "0.53.1",
+    "camshaft": "0.54.0",
     "cartodb-psql": "~0.7.1",
     "cartodb-query-tables": "0.2.0",
     "cartodb-redis": "0.13.2",
diff --git a/yarn.lock b/yarn.lock
index 83f96064..9a3c48fe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -194,9 +194,9 @@ camelcase@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
 
-camshaft@0.53.1:
-  version "0.53.1"
-  resolved "https://registry.yarnpkg.com/camshaft/-/camshaft-0.53.1.tgz#ba280be034e161c4989e1c81bafcdeb42d10ef7b"
+camshaft@0.54.0:
+  version "0.54.0"
+  resolved "https://registry.yarnpkg.com/camshaft/-/camshaft-0.54.0.tgz#9cb23b827dee0f54d0a39b8af3213692f11adf62"
   dependencies:
     async "^1.5.2"
     bunyan "1.8.1"