diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d24be0dc4c9..340db4ded261 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ BUG FIXES:
     leader [GH-1656]
   * discovery: Fix client flapping when server is in a different datacenter as
     the client [GH-1641]
+  * driver/docker: Fix `local/` directory mount into container [GH-1830]
 
 ## 0.4.1 (August 18, 2016)
 
diff --git a/client/driver/docker.go b/client/driver/docker.go
index f28808799290..ffc05fe7e6bc 100644
--- a/client/driver/docker.go
+++ b/client/driver/docker.go
@@ -381,10 +381,12 @@ func (d *DockerDriver) containerBinds(driverConfig *DockerDriverConfig, alloc *a
 	task *structs.Task) ([]string, error) {
 
 	shared := alloc.SharedDir
-	local, ok := alloc.TaskDirs[task.Name]
+	taskDir, ok := alloc.TaskDirs[task.Name]
 	if !ok {
 		return nil, fmt.Errorf("Failed to find task local directory: %v", task.Name)
 	}
+	local := filepath.Join(taskDir, allocdir.TaskLocal)
+
 	secret, err := alloc.GetSecretDir(task.Name)
 	if err != nil {
 		return nil, err