diff --git a/.gitignore b/.gitignore
index 8091c6b..dae2204 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@
 /nodejs-mapnik-3.5.0.tar.gz
 /nodejs-mapnik-3.5.1.tar.gz
 /nodejs-mapnik-3.5.2.tar.gz
+/nodejs-mapnik-3.5.4.tar.gz
diff --git a/nodejs-mapnik-boost.patch b/nodejs-mapnik-boost.patch
index 57f1638..e41f719 100644
--- a/nodejs-mapnik-boost.patch
+++ b/nodejs-mapnik-boost.patch
@@ -1,28 +1,37 @@
-commit f87bb4a201dfaff557df32f4f95868c0ed24f06c
+commit ce0c11d2e305fd8a33426d2dd9db27a3243b45fa
 Author: Tom Hughes <tom@compton.nu>
 Date:   Wed Mar 2 14:11:26 2016 +0000
 
     Update tests for changes in boost 1.60
 
 diff --git a/test/vector-tile.test.js b/test/vector-tile.test.js
-index 905e885..6c116c1 100644
+index 4a18900..bed4b85 100644
 --- a/test/vector-tile.test.js
 +++ b/test/vector-tile.test.js
-@@ -2126,7 +2126,7 @@ describe('mapnik.VectorTile ', function() {
+@@ -2163,7 +2163,7 @@ describe('mapnik.VectorTile ', function() {
          map.render(vtile, opts, function(err, vtile) {
              if (err) throw err;
              if (hasBoostSimple) {
 -                assert.equal(vtile.reportGeometrySimplicity().length, 0);
 +                assert.equal(vtile.reportGeometrySimplicity().length, 1);
-                 assert.equal(vtile.reportGeometryValidity().length, 15); // Dataset not expected to be OGC valid
+                 assert.equal(vtile.reportGeometryValidity().length, 14); // Dataset not expected to be OGC valid
+                 assert.equal(vtile.reportGeometryValidity({split_multi_features:true}).length, 0);
              }
-             var expected = './test/data/vector_tile/tile_threading_auto.mvt';
-@@ -2163,7 +2163,7 @@ describe('mapnik.VectorTile ', function() {
+@@ -2201,7 +2201,7 @@ describe('mapnik.VectorTile ', function() {
          map.render(vtile, opts, function(err, vtile) {
              if (err) throw err;
              if (hasBoostSimple) {
 -                assert.equal(vtile.reportGeometrySimplicity().length, 0);
 +                assert.equal(vtile.reportGeometrySimplicity().length, 1);
-                 assert.equal(vtile.reportGeometryValidity().length, 15); // Dataset not expected to be OGC valid
+                 assert.equal(vtile.reportGeometryValidity().length, 14); // Dataset not expected to be OGC valid
+                 assert.equal(vtile.reportGeometryValidity({split_multi_features:true}).length, 0);
              }
-             var expected = './test/data/vector_tile/tile_threading_async.mvt';
+@@ -3493,7 +3493,7 @@ describe('mapnik.VectorTile ', function() {
+                                              'landcover', 'hillshade', 'contour']);
+             assert.equal(vtile.reportGeometryValidity().length, 0);
+             assert.equal(vtile.reportGeometryValidity({split_multi_features:true}).length, 0);
+-            assert.equal(vtile.reportGeometrySimplicity().length, 6);
++            assert.equal(vtile.reportGeometrySimplicity().length, 9);
+             done();
+         });
+     });
diff --git a/nodejs-mapnik.spec b/nodejs-mapnik.spec
index af2f6a9..3e9a3a0 100644
--- a/nodejs-mapnik.spec
+++ b/nodejs-mapnik.spec
@@ -1,5 +1,5 @@
 Name:           nodejs-mapnik
-Version:        3.5.2
+Version:        3.5.4
 Release:        1%{?dist}
 Summary:        Bindings to Mapnik tile rendering library for Node.js
 
@@ -34,7 +34,7 @@ BuildRequires:  polyclipping-devel
 BuildRequires:  protobuf-lite-devel
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  libxml2-devel
-BuildRequires:  npm(mapnik-vector-tile) >= 1.0.2
+BuildRequires:  npm(mapnik-vector-tile) >= 1.0.5
 
 BuildRequires:  mapnik-utils
 BuildRequires:  npm(mocha)
@@ -85,6 +85,9 @@ ln -s  %{nodejs_sitelib}/mapnik/bin/mapnik-inspect.js %{buildroot}/%{_bindir}/ma
 
 
 %changelog
+* Tue Mar 22 2016 Tom Hughes <tom@compton.nu> - 3.5.4-1
+- Update to 3.5.4 upstream release
+
 * Thu Mar  3 2016 Tom Hughes <tom@compton.nu> - 3.5.2-1
 - Update to 3.5.2 upstream release
 
diff --git a/sources b/sources
index abc2af1..fc60e3e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ecc99165438e9ecf823b78f1a003afce  nodejs-mapnik-3.5.2.tar.gz
+6ff3a816e39c15b3a4f1c77a0b197c39  nodejs-mapnik-3.5.4.tar.gz