diff --git a/src/config.coffee b/src/config.coffee
index ce27d41d..e335f4d5 100644
--- a/src/config.coffee
+++ b/src/config.coffee
@@ -49,3 +49,4 @@ module.exports =
 		'RESIN_API_KEY'
 	]
 	dataPath: checkString(process.env.RESIN_DATA_PATH) ? '/resin-data'
+	bootMountPoint: checkString(process.env.BOOT_MOUNTPOINT) ? '/boot'
diff --git a/src/device.coffee b/src/device.coffee
index a191940b..3b930efd 100644
--- a/src/device.coffee
+++ b/src/device.coffee
@@ -47,7 +47,7 @@ exports.reboot = ->
 exports.hostConfigEnvVarPrefix = 'RESIN_HOST_'
 bootConfigEnvVarPrefix = 'RESIN_HOST_CONFIG_'
 bootBlockDevice = '/dev/mmcblk0p1'
-bootMountPoint = '/mnt/root/boot'
+bootMountPoint = '/mnt/root' + config.bootMountPoint
 bootConfigPath = bootMountPoint + '/config.txt'
 configRegex = new RegExp('(' + _.escapeRegExp(bootConfigEnvVarPrefix) + ')(.+)')
 forbiddenConfigKeys = [