diff --git a/src/main/java/com/github/dockerjava/api/command/DockerCmd.java b/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
index 4c30382b4..89c31666f 100644
--- a/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/DockerCmd.java
@@ -1,6 +1,8 @@
 package com.github.dockerjava.api.command;
 
-public interface DockerCmd<RES_T> {
+import java.io.Closeable;
+
+public interface DockerCmd<RES_T> extends Closeable {
 
 	public RES_T exec();
 
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
index 00c89159e..54312c50c 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.core.command;
 
+import java.io.IOException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,4 +27,7 @@ public RES_T exec() throws DockerException {
 		LOGGER.debug("Cmd: {}", this);
 		return execution.exec((CMD_T)this);
 	}
-}
\ No newline at end of file
+
+    @Override
+	public void close() throws IOException {}
+}
diff --git a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
index a62b75c06..a9c0a44b9 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -40,6 +40,7 @@ public class BuildImageCmdImpl extends AbstrDockerCmd<BuildImageCmd, InputStream
 			.compile("^ENV\\s+(.*)\\s+(.*)$");
 
 	private InputStream tarInputStream = null;
+	private File tarFile = null;
 	private String tag;
 	private boolean noCache;
 	private boolean remove = true;
@@ -48,7 +49,13 @@ public class BuildImageCmdImpl extends AbstrDockerCmd<BuildImageCmd, InputStream
 	public BuildImageCmdImpl(BuildImageCmd.Exec exec, File dockerFolder) {
 		super(exec);
 		Preconditions.checkNotNull(dockerFolder, "dockerFolder is null");
-		withTarInputStream(buildDockerFolderTar(dockerFolder));
+		tarFile = buildDockerFolderTar(dockerFolder);
+		try {
+			withTarInputStream(FileUtils.openInputStream(tarFile));
+		} catch (IOException e) {
+			// we just created the file this should never happen.
+			throw new RuntimeException(e);
+		}
 	}
 
 	public BuildImageCmdImpl(BuildImageCmd.Exec exec, InputStream tarInputStream) {
@@ -129,6 +136,14 @@ public BuildImageCmdImpl withQuiet(boolean quiet) {
 		return this;
 	}
 
+	@Override
+	public void close() throws IOException {
+		super.close();
+		if (tarFile != null) {
+			FileUtils.deleteQuietly(tarFile);
+		}
+	}
+
 	@Override
 	public String toString() {
 		return new StringBuilder("build ")
@@ -139,7 +154,7 @@ public String toString() {
 				.toString();
 	}
 
-	protected InputStream buildDockerFolderTar(File dockerFolder) {
+	protected File buildDockerFolderTar(File dockerFolder) {
 		Preconditions.checkArgument(dockerFolder.exists(),
 				"Path %s doesn't exist", dockerFolder);
 		Preconditions.checkArgument(dockerFolder.isDirectory(),
@@ -255,9 +270,8 @@ protected InputStream buildDockerFolderTar(File dockerFolder) {
 				}
 			}
 
-			dockerFolderTar = CompressArchiveUtil.archiveTARFiles(dockerFolder,
+			return CompressArchiveUtil.archiveTARFiles(dockerFolder,
 					filesToAdd, archiveNameWithOutExtension);
-			return FileUtils.openInputStream(dockerFolderTar);
 		} catch (IOException ex) {
 			FileUtils.deleteQuietly(dockerFolderTar);
 			throw new DockerClientException(