diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d8caf94..1ba6e573 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v7.8.3 - 2018-07-25
+
+* Follow links found during builds #931 [Tim Perry]
+
 ## v7.8.2 - 2018-07-25
 
 * Update reconfix to fix volume signature errors in local configure #929 [Tim Perry]
diff --git a/lib/utils/compose.coffee b/lib/utils/compose.coffee
index a45ff51d..793f58d8 100644
--- a/lib/utils/compose.coffee
+++ b/lib/utils/compose.coffee
@@ -110,7 +110,7 @@ exports.tarDirectory = tarDirectory = (dir) ->
 	streamToPromise = require('stream-to-promise')
 
 	getFiles = ->
-		streamToPromise(klaw(dir))
+		streamToPromise(klaw(dir, { followLinks: true }))
 		.filter((item) -> not item.stats.isDirectory())
 		.map((item) -> item.path)
 
diff --git a/package.json b/package.json
index 10c18a90..00ad5aa3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "resin-cli",
-  "version": "7.8.2",
+  "version": "7.8.3",
   "description": "The official resin.io CLI tool",
   "main": "./build/actions/index.js",
   "homepage": "https://github.com/resin-io/resin-cli",
@@ -121,7 +121,7 @@
     "inquirer": "^3.1.1",
     "is-root": "^1.0.0",
     "js-yaml": "^3.10.0",
-    "klaw": "^1.3.1",
+    "klaw": "github:resin-io-modules/node-klaw#follow-symlinks",
     "lodash": "^4.17.4",
     "mixpanel": "^0.4.0",
     "mkdirp": "^0.5.1",
@@ -142,7 +142,6 @@
     "resin-config-json": "^1.0.0",
     "resin-device-config": "^4.0.0",
     "resin-device-init": "^4.0.0",
-    "resin-docker-build": "^0.6.2",
     "resin-doodles": "0.0.1",
     "resin-image-fs": "^5.0.2",
     "resin-image-manager": "^5.0.0",