diff --git a/.travis.yml b/.travis.yml
index 5b2a4b9b..cec4f06f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,13 @@ before_install:
   - sudo apt-add-repository --yes ppa:cartodb/postgresql-9.3
   - sudo apt-add-repository --yes ppa:cartodb/gis
   - sudo rm -Rf /var/lib/postgresql /etc/postgresql
-  - sudo apt-add-repository --yes ppa:mapnik/v2.1.0
+  - sudo apt-add-repository --yes ppa:mapnik/nightly-2.3
   - sudo apt-get update
   - sudo apt-get install -y postgresql-9.3-postgis-2.1
   - sudo apt-get install -y postgresql-contrib-9.3
-  - sudo apt-get install -y libmapnik-dev
+  - sudo apt-get install -q libprotobuf-dev protobuf-compiler
+  - sudo apt-get install -q libmapnik-dev
+  - sudo apt-get install -q mapnik-input-plugin-gdal mapnik-input-plugin-ogr mapnik-input-plugin-postgis
   - sudo apt-get install -y gdal-bin
   - echo -e "local\tall\tall\ttrust\nhost\tall\tall\t127.0.0.1/32\ttrust\nhost\tall\tall\t::1/128\ttrust" |sudo tee /etc/postgresql/9.3/main/pg_hba.conf
   - sudo service postgresql restart
diff --git a/NEWS.md b/NEWS.md
index 5cefa031..a95f6e61 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,6 +1,9 @@
 1.16.2 -- 2014-mm-dd
 --------------------
 
+New features:
+ - Starts using mapnik 2.3.x
+
 Enhancements:
  - Upgrades windshaft and cartodb-redis
  - Supports `!scale_denominator!` dynamic param in SQL queries
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index afe3439d..a21dfbb5 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -10,20 +10,27 @@
       "version": "1.6.0"
     },
     "windshaft": {
-      "version": "0.25.1",
-      "from": "https://github.com/CartoDB/Windshaft/tarball/0.25.1",
+      "version": "0.27.0",
+      "from": "https://github.com/CartoDB/Windshaft/tarball/0.27.0",
       "dependencies": {
+        "chronograph": {
+          "version": "0.1.0",
+          "from": "git://github.com/CartoDB/chronographjs.git#0.1.0"
+        },
         "grainstore": {
-          "version": "0.20.0",
-          "from": "git://github.com/CartoDB/grainstore.git#0.20.0",
+          "version": "0.22.0",
+          "from": "https://github.com/CartoDB/grainstore/tarball/0.22.0",
           "dependencies": {
             "carto": {
               "version": "0.9.5-cdb2",
-              "from": "http://github.com/CartoDB/carto/tarball/0.9.5-cdb2",
+              "from": "https://github.com/CartoDB/carto/tarball/0.9.5-cdb2",
               "dependencies": {
                 "underscore": {
                   "version": "1.4.4"
                 },
+                "mapnik-reference": {
+                  "version": "5.0.9"
+                },
                 "xml2js": {
                   "version": "0.2.8",
                   "dependencies": {
@@ -45,9 +52,6 @@
                 }
               }
             },
-            "mapnik-reference": {
-              "version": "5.0.9"
-            },
             "millstone": {
               "version": "0.6.14",
               "dependencies": {
@@ -891,27 +895,275 @@
             }
           }
         },
+        "mapnik": {
+          "version": "1.4.15",
+          "from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb",
+          "dependencies": {
+            "nan": {
+              "version": "1.2.0"
+            },
+            "mapnik-vector-tile": {
+              "version": "0.5.5"
+            },
+            "node-pre-gyp": {
+              "version": "0.5.25",
+              "dependencies": {
+                "nopt": {
+                  "version": "3.0.1",
+                  "dependencies": {
+                    "abbrev": {
+                      "version": "1.0.5"
+                    }
+                  }
+                },
+                "npmlog": {
+                  "version": "0.1.1",
+                  "dependencies": {
+                    "ansi": {
+                      "version": "0.3.0"
+                    }
+                  }
+                },
+                "request": {
+                  "version": "2.40.0",
+                  "dependencies": {
+                    "qs": {
+                      "version": "1.0.2"
+                    },
+                    "json-stringify-safe": {
+                      "version": "5.0.0"
+                    },
+                    "mime-types": {
+                      "version": "1.0.2"
+                    },
+                    "forever-agent": {
+                      "version": "0.5.2"
+                    },
+                    "node-uuid": {
+                      "version": "1.4.1"
+                    },
+                    "tough-cookie": {
+                      "version": "0.12.1",
+                      "dependencies": {
+                        "punycode": {
+                          "version": "1.3.1"
+                        }
+                      }
+                    },
+                    "form-data": {
+                      "version": "0.1.4",
+                      "dependencies": {
+                        "combined-stream": {
+                          "version": "0.0.5",
+                          "dependencies": {
+                            "delayed-stream": {
+                              "version": "0.0.5"
+                            }
+                          }
+                        },
+                        "mime": {
+                          "version": "1.2.11"
+                        },
+                        "async": {
+                          "version": "0.9.0"
+                        }
+                      }
+                    },
+                    "tunnel-agent": {
+                      "version": "0.4.0"
+                    },
+                    "http-signature": {
+                      "version": "0.10.0",
+                      "dependencies": {
+                        "assert-plus": {
+                          "version": "0.1.2"
+                        },
+                        "asn1": {
+                          "version": "0.1.11"
+                        },
+                        "ctype": {
+                          "version": "0.5.2"
+                        }
+                      }
+                    },
+                    "oauth-sign": {
+                      "version": "0.3.0"
+                    },
+                    "hawk": {
+                      "version": "1.1.1",
+                      "dependencies": {
+                        "hoek": {
+                          "version": "0.9.1"
+                        },
+                        "boom": {
+                          "version": "0.4.2"
+                        },
+                        "cryptiles": {
+                          "version": "0.2.2"
+                        },
+                        "sntp": {
+                          "version": "0.2.4"
+                        }
+                      }
+                    },
+                    "aws-sign2": {
+                      "version": "0.5.0"
+                    },
+                    "stringstream": {
+                      "version": "0.0.4"
+                    }
+                  }
+                },
+                "semver": {
+                  "version": "3.0.1"
+                },
+                "tar": {
+                  "version": "1.0.1",
+                  "dependencies": {
+                    "block-stream": {
+                      "version": "0.0.7"
+                    },
+                    "fstream": {
+                      "version": "1.0.2",
+                      "dependencies": {
+                        "graceful-fs": {
+                          "version": "3.0.2"
+                        }
+                      }
+                    },
+                    "inherits": {
+                      "version": "2.0.1"
+                    }
+                  }
+                },
+                "tar-pack": {
+                  "version": "2.0.0",
+                  "dependencies": {
+                    "uid-number": {
+                      "version": "0.0.3"
+                    },
+                    "once": {
+                      "version": "1.1.1"
+                    },
+                    "debug": {
+                      "version": "0.7.4"
+                    },
+                    "fstream": {
+                      "version": "0.1.31",
+                      "dependencies": {
+                        "graceful-fs": {
+                          "version": "3.0.2"
+                        },
+                        "inherits": {
+                          "version": "2.0.1"
+                        }
+                      }
+                    },
+                    "tar": {
+                      "version": "0.1.20",
+                      "dependencies": {
+                        "block-stream": {
+                          "version": "0.0.7"
+                        },
+                        "inherits": {
+                          "version": "2.0.1"
+                        }
+                      }
+                    },
+                    "fstream-ignore": {
+                      "version": "0.0.7",
+                      "dependencies": {
+                        "minimatch": {
+                          "version": "0.2.14",
+                          "dependencies": {
+                            "lru-cache": {
+                              "version": "2.5.0"
+                            },
+                            "sigmund": {
+                              "version": "1.0.0"
+                            }
+                          }
+                        },
+                        "inherits": {
+                          "version": "2.0.1"
+                        }
+                      }
+                    },
+                    "readable-stream": {
+                      "version": "1.0.31",
+                      "dependencies": {
+                        "core-util-is": {
+                          "version": "1.0.1"
+                        },
+                        "isarray": {
+                          "version": "0.0.1"
+                        },
+                        "string_decoder": {
+                          "version": "0.10.31"
+                        },
+                        "inherits": {
+                          "version": "2.0.1"
+                        }
+                      }
+                    },
+                    "graceful-fs": {
+                      "version": "1.2.3"
+                    }
+                  }
+                },
+                "mkdirp": {
+                  "version": "0.5.0",
+                  "dependencies": {
+                    "minimist": {
+                      "version": "0.0.8"
+                    }
+                  }
+                },
+                "rc": {
+                  "version": "0.5.1",
+                  "dependencies": {
+                    "minimist": {
+                      "version": "0.0.10"
+                    },
+                    "deep-extend": {
+                      "version": "0.2.11"
+                    },
+                    "strip-json-comments": {
+                      "version": "0.1.3"
+                    },
+                    "ini": {
+                      "version": "1.1.0"
+                    }
+                  }
+                },
+                "rimraf": {
+                  "version": "2.2.8"
+                }
+              }
+            }
+          }
+        },
         "tilelive": {
-          "version": "4.4.3",
+          "version": "4.5.3",
           "dependencies": {
             "optimist": {
-              "version": "0.3.7",
+              "version": "0.6.1",
               "dependencies": {
                 "wordwrap": {
                   "version": "0.0.2"
+                },
+                "minimist": {
+                  "version": "0.0.10"
                 }
               }
             },
             "sphericalmercator": {
               "version": "1.0.2"
-            },
-            "underscore": {
-              "version": "1.3.3"
             }
           }
         },
         "tilelive-mapnik": {
-          "version": "0.6.9",
+          "version": "0.6.11",
           "dependencies": {
             "underscore": {
               "version": "1.3.3"
@@ -927,10 +1179,6 @@
             }
           }
         },
-        "mapnik": {
-          "version": "0.7.26-cdb1",
-          "from": "http://github.com/Vizzuality/node-mapnik/tarball/0.7.26-cdb1"
-        },
         "carto": {
           "version": "0.9.5-cdb3",
           "from": "http://github.com/CartoDB/carto/tarball/0.9.5-cdb3",
@@ -981,8 +1229,13 @@
       "version": "2.9.203"
     },
     "cartodb-redis": {
-      "version": "0.10.0",
-      "from": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.10.0"
+      "version": "0.11.0",
+      "from": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0",
+      "dependencies": {
+        "dot": {
+          "version": "1.0.2"
+        }
+      }
     },
     "cartodb-psql": {
       "version": "0.4.0",
@@ -1029,13 +1282,13 @@
       "version": "1.3.7"
     },
     "log4js": {
-      "version": "0.6.17",
+      "version": "0.6.21",
       "dependencies": {
         "async": {
-          "version": "0.1.15"
+          "version": "0.2.10"
         },
         "readable-stream": {
-          "version": "1.0.27-1",
+          "version": "1.0.32",
           "dependencies": {
             "core-util-is": {
               "version": "1.0.1"
@@ -1044,7 +1297,7 @@
               "version": "0.0.1"
             },
             "string_decoder": {
-              "version": "0.10.25-1"
+              "version": "0.10.31"
             },
             "inherits": {
               "version": "2.0.1"
@@ -1100,7 +1353,7 @@
           "version": "1.0.7"
         },
         "debug": {
-          "version": "1.0.4",
+          "version": "2.0.0",
           "dependencies": {
             "ms": {
               "version": "0.6.2"
diff --git a/package.json b/package.json
index 99627479..1f542da7 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "dependencies": {
         "node-varnish": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0",
         "underscore"  : "~1.6.0",
-        "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.26.0",
+        "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.27.0",
         "step": "~0.0.5",
         "request": "~2.9.203",
         "cartodb-redis": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0",
diff --git a/test/acceptance/multilayer.js b/test/acceptance/multilayer.js
index 77474a6b..ed1b1f4c 100644
--- a/test/acceptance/multilayer.js
+++ b/test/acceptance/multilayer.js
@@ -157,7 +157,7 @@ suite('multilayer:postgres=' + cdbQueryTablesFromPostgresEnabledValue, function(
               method: 'GET'
           }, {}, function(res) {
               assert.equal(res.statusCode, 200, res.body);
-              assert.equal(res.headers['content-type'], "text/javascript; charset=utf-8; charset=utf-8");
+              assert.equal(res.headers['content-type'], "application/json; charset=utf-8");
               assert.utfgridEqualsFile(res.body, 'test/fixtures/test_table_0_0_0_multilayer1.layer0.grid.json', 2,
                 function(err, similarity) {
                   next(err);
@@ -175,7 +175,7 @@ suite('multilayer:postgres=' + cdbQueryTablesFromPostgresEnabledValue, function(
               method: 'GET'
           }, {}, function(res) {
               assert.equal(res.statusCode, 200, res.body);
-              assert.equal(res.headers['content-type'], "text/javascript; charset=utf-8; charset=utf-8");
+              assert.equal(res.headers['content-type'], "application/json; charset=utf-8");
               assert.utfgridEqualsFile(res.body, 'test/fixtures/test_table_0_0_0_multilayer1.layer1.grid.json', 2,
                 function(err, similarity) {
                   next(err);
@@ -458,7 +458,7 @@ suite('multilayer:postgres=' + cdbQueryTablesFromPostgresEnabledValue, function(
               method: 'GET'
           }, {}, function(res) {
               assert.equal(res.statusCode, 200, res.body);
-              assert.equal(res.headers['content-type'], "text/javascript; charset=utf-8; charset=utf-8");
+              assert.equal(res.headers['content-type'], "application/json; charset=utf-8");
               assert.utfgridEqualsFile(res.body, 'test/fixtures/test_multilayer_bbox.grid.json', 2,
                 function(err, similarity) {
                   next(err);
@@ -476,7 +476,7 @@ suite('multilayer:postgres=' + cdbQueryTablesFromPostgresEnabledValue, function(
               method: 'GET'
           }, {}, function(res) {
               assert.equal(res.statusCode, 200, res.body);
-              assert.equal(res.headers['content-type'], "text/javascript; charset=utf-8; charset=utf-8");
+              assert.equal(res.headers['content-type'], "application/json; charset=utf-8");
               assert.utfgridEqualsFile(res.body, 'test/fixtures/test_multilayer_bbox.grid.json', 2,
                 function(err, similarity) {
                   next(err);
@@ -752,7 +752,7 @@ suite('multilayer:postgres=' + cdbQueryTablesFromPostgresEnabledValue, function(
               method: 'GET'
           }, {}, function(res) {
               assert.equal(res.statusCode, 200, res.body);
-              assert.equal(res.headers['content-type'], "text/javascript; charset=utf-8; charset=utf-8");
+              assert.equal(res.headers['content-type'], "application/json; charset=utf-8");
               next(err);
           });
         },
diff --git a/test/acceptance/server.js b/test/acceptance/server.js
index 280d54d1..a2e2324e 100644
--- a/test/acceptance/server.js
+++ b/test/acceptance/server.js
@@ -586,7 +586,7 @@ suite('multilayer:postgres=' + cdbQueryTablesFromPostgresEnabledValue, function(
             method: 'GET'
         },{
             status: 200,
-            headers: { 'Content-Type': 'text/javascript; charset=utf-8; charset=utf-8',
+            headers: { 'Content-Type': 'application/json; charset=utf-8',
                        'X-Cache-Channel': test_database+':gadm4' }
         }, function() { done(); });
     });
@@ -598,7 +598,7 @@ suite('multilayer:postgres=' + cdbQueryTablesFromPostgresEnabledValue, function(
             method: 'GET'
         },{
             status: 200,
-            headers: { 'Content-Type': 'text/javascript; charset=utf-8; charset=utf-8' }
+            headers: { 'Content-Type': 'application/json; charset=utf-8' }
         }, function() { done(); });
     });
     
@@ -610,7 +610,7 @@ suite('multilayer:postgres=' + cdbQueryTablesFromPostgresEnabledValue, function(
             method: 'GET'
         },{
             status: 200,
-            headers: { 'Content-Type': 'text/javascript; charset=utf-8; charset=utf-8' }
+            headers: { 'Content-Type': 'application/json; charset=utf-8' }
         }, function() { done(); });
     });