diff --git a/.dockerignore b/.dockerignore
index 13d53d0d..6cbff056 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,6 @@
 .DS_Store
 .idea
+.trash-cache
 bin
 state
 build
diff --git a/trash.conf b/trash.conf
index dc44cbb4..08d8900e 100644
--- a/trash.conf
+++ b/trash.conf
@@ -11,7 +11,7 @@ github.com/coreos/go-iptables fbb73372b87f6e89951c2b6b31470c2c9d5cfae3
 github.com/coreos/go-systemd v4
 github.com/coreos/yaml 6b16a5714269b2f70720a45406b1babd947a17ef
 github.com/davecgh/go-spew 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d
-github.com/docker/containerd 1674135d5e32ea16d2ed0967f00325c7276b984b https://github.com/ibuildthecloud/containerd.git
+github.com/docker/containerd b7a26a1c481d5ba88a2df757954a54439142ceb1 https://github.com/ibuildthecloud/containerd.git
 github.com/docker/distribution 467fc068d88aa6610691b7f1a677271a3fac4aac 
 github.com/docker/docker bf16bd9dcfc3c9fafb7eb7b39ae7ef7abf1ae7f1 https://github.com/rancher/docker.git
 github.com/docker/engine-api v0.3.3
diff --git a/vendor/github.com/docker/containerd/subreaper/exec/wrapper.go b/vendor/github.com/docker/containerd/subreaper/exec/wrapper.go
index 2a6f2d64..1b2b5978 100644
--- a/vendor/github.com/docker/containerd/subreaper/exec/wrapper.go
+++ b/vendor/github.com/docker/containerd/subreaper/exec/wrapper.go
@@ -59,6 +59,9 @@ func (c *Cmd) Start() error {
 }
 
 func (c *Cmd) Wait() error {
+	// c.Cmd.Wait() will always error because there is no child process anymore
+	// This is called to ensure that the streams are closed and cleaned up properly
+	defer c.Cmd.Wait()
 	if c.sub == nil {
 		return c.err
 	}