diff --git a/NEWS.md b/NEWS.md
index 3b451a59..49c05f99 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -3,6 +3,7 @@
 * Fix deadlock on new style creation
 * Fix database authentication with multi-table layergroups
 * Add tile and grid fetching checks at layergroup creation time
+* Fix SQL error reporting to NOT split on newline
 
 1.3.0
 ------
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 1e952a06..801c08bf 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -9,7 +9,7 @@
       "version": "1.3.3"
     },
     "windshaft": {
-      "version": "0.12.6",
+      "version": "0.12.7",
       "dependencies": {
         "grainstore": {
           "version": "0.13.4",
@@ -81,7 +81,7 @@
                           "version": "0.1.22",
                           "dependencies": {
                             "rimraf": {
-                              "version": "2.1.4"
+                              "version": "2.2.0"
                             },
                             "graceful-fs": {
                               "version": "1.2.2"
diff --git a/package.json b/package.json
index 771aedb6..2d4b33a0 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "dependencies": {
         "node-varnish": "0.1.1",
         "underscore"  : "~1.3.3",
-        "windshaft"  : "~0.12.6",
+        "windshaft"  : "~0.12.7",
         "step": "0.0.x",
         "generic-pool": "~2.0.3",
         "redis": "~0.8.3",