diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt
index f75a6ee669..dc4d13dd12 100644
--- a/ports/boost-modular-build-helper/CMakeLists.txt
+++ b/ports/boost-modular-build-helper/CMakeLists.txt
@@ -28,8 +28,10 @@ else()
     list(APPEND B2_OPTIONS link=static)
 endif()
 
-if(CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
     list(APPEND B2_OPTIONS address-model=64)
+else()
+    list(APPEND B2_OPTIONS address-model=32)
 endif()
 
 if(APPLE)
diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL
index 7324d6ba09..0ee7833901 100644
--- a/ports/boost-modular-build-helper/CONTROL
+++ b/ports/boost-modular-build-helper/CONTROL
@@ -1,2 +1,2 @@
 Source: boost-modular-build-helper
-Version: 2018-04-16-4
+Version: 2018-05-14