diff --git a/pom.xml b/pom.xml
index a6c343ce6..e0edc4943 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,6 +194,13 @@
 			<version>${hamcrest.jpa-matchers}</version>
 			<scope>test</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>com.google.code.findbugs</groupId>
+			<artifactId>annotations</artifactId>
+			<version>3.0.0</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 
 	<distributionManagement>
diff --git a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
index 5a41a61fb..c737501fa 100644
--- a/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/BuildImageCmd.java
@@ -1,44 +1,95 @@
 package com.github.dockerjava.api.command;
 
-import java.io.File;
-import java.io.InputStream;
-
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.api.model.BuildResponseItem;
 
+import javax.annotation.CheckForNull;
+import java.io.File;
+import java.io.InputStream;
+import java.net.URI;
+
 /**
- *
  * Build an image from Dockerfile.
- *
+ * <p>
  * TODO: http://docs.docker.com/reference/builder/#dockerignore
  *
+ * @see <a href="https://docs.docker.com/reference/api/docker_remote_api_v1.20/#build-image-from-a-dockerfile">build-image-from-a-dockerfile</a>
  */
 public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildResponseItem> {
 
-    public BuildImageCmd withTag(String tag);
+// lib specific
 
     public InputStream getTarInputStream();
 
+    public AuthConfigurations getBuildAuthConfigs();
+
+// getters
+
+    /**
+     * "t" in API
+     */
+    @CheckForNull
     public String getTag();
 
+    /**
+     * "remote" in API
+     */
+    @CheckForNull
+    public URI getRemote();
+
+    /**
+     * "nocache" in API
+     */
     public boolean hasNoCacheEnabled();
 
+    /**
+     * "rm" in API
+     */
     public boolean hasRemoveEnabled();
 
+    /**
+     * "forcerm" in API
+     */
+    public boolean isForcerm();
+
+    @CheckForNull
+    public Boolean getForcerm();
+
+    /**
+     * "q" in API
+     */
     public boolean isQuiet();
 
+    /**
+     * "pull" in API
+     */
     public boolean hasPullEnabled();
 
+    @CheckForNull
     public String getPathToDockerfile();
 
-    public AuthConfigurations getBuildAuthConfigs();
+    @CheckForNull
+    public Long getMemory();
+
+    @CheckForNull
+    public Long getMemswap();
+
+    @CheckForNull
+    public String getCpushares();
+
+    @CheckForNull
+    public String getCpusetcpus();
+
+// setters
+
+    public BuildImageCmd withTag(String tag);
+
+    public BuildImageCmd withRemote(URI remote);
 
     public BuildImageCmd withBaseDirectory(File baseDirectory);
 
     public BuildImageCmd withDockerfile(File dockerfile);
 
-    public BuildImageCmd withTarInputStream(InputStream tarInputStream);
-
     public BuildImageCmd withNoCache();
 
     public BuildImageCmd withNoCache(boolean noCache);
@@ -47,6 +98,10 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     public BuildImageCmd withRemove(boolean rm);
 
+    public BuildImageCmd withForcerm();
+
+    public BuildImageCmd withForcerm(Boolean forcerm);
+
     public BuildImageCmd withQuiet();
 
     public BuildImageCmd withQuiet(boolean quiet);
@@ -55,8 +110,20 @@ public interface BuildImageCmd extends AsyncDockerCmd<BuildImageCmd, BuildRespon
 
     public BuildImageCmd withPull(boolean pull);
 
+    public BuildImageCmd withMemory(long memory);
+
+    public BuildImageCmd withMemswap(long memswap);
+
+    public BuildImageCmd withCpushares(String cpushares);
+
+    public BuildImageCmd withCpusetcpus(String cpusetcpus);
+
+// setters lib specific
+
     public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfig);
 
+    public BuildImageCmd withTarInputStream(InputStream tarInputStream);
+
     public static interface Exec extends DockerCmdAsyncExec<BuildImageCmd, BuildResponseItem> {
     }
 
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 56ce8f78f..f516a1f17 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -5,12 +5,17 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 
 import com.github.dockerjava.api.command.BuildImageCmd;
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.github.dockerjava.api.model.BuildResponseItem;
 import com.github.dockerjava.core.FilePathUtil;
 import com.github.dockerjava.core.dockerfile.Dockerfile;
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import javax.annotation.CheckForNull;
 
 /**
  *
@@ -19,8 +24,10 @@
  */
 public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildResponseItem> implements BuildImageCmd {
 
-    private InputStream tarInputStream = null;
+    @CheckForNull
+    private InputStream tarInputStream;
 
+    @CheckForNull
     private String tag;
 
     private boolean noCache;
@@ -31,12 +38,33 @@ public class BuildImageCmdImpl extends AbstrAsyncDockerCmd<BuildImageCmd, BuildR
 
     private boolean pull;
 
+    @CheckForNull
     private AuthConfigurations buildAuthConfigs;
 
+    @CheckForNull
     private File dockerFile;
 
+    @CheckForNull
     private File baseDirectory;
 
+    @CheckForNull
+    private String cpusetcpus;
+
+    @CheckForNull
+    private Long memory;
+
+    @CheckForNull
+    private String cpushares;
+
+    @CheckForNull
+    private Boolean forcerm;
+
+    @CheckForNull
+    private Long memswap;
+
+    @CheckForNull
+    private URI remote;
+
     public BuildImageCmdImpl(BuildImageCmd.Exec exec) {
         super(exec);
     }
@@ -59,60 +87,36 @@ public BuildImageCmdImpl(BuildImageCmd.Exec exec, InputStream tarInputStream) {
         withTarInputStream(tarInputStream);
     }
 
-    @Override
-    public InputStream getTarInputStream() {
-        return tarInputStream;
-    }
+// getters API
 
     @Override
-    public BuildImageCmdImpl withDockerfile(File dockerfile) {
-        checkNotNull(dockerfile);
-        if (!dockerfile.exists())
-            throw new IllegalArgumentException("Dockerfile does not exist");
-        if (!dockerfile.isFile())
-            throw new IllegalArgumentException("Not a directory");
-
-        if (baseDirectory == null)
-            withBaseDirectory(dockerfile.getParentFile());
-
-        this.dockerFile = dockerfile;
-
-        try {
-            withTarInputStream(new Dockerfile(dockerfile).parse().buildDockerFolderTar(baseDirectory));
-        } catch (IOException e) {
-            // we just created the file this should never happen.
-            throw new RuntimeException(e);
-        }
-        return this;
+    public String getTag() {
+        return tag;
     }
 
     @Override
-    public BuildImageCmdImpl withTarInputStream(InputStream tarInputStream) {
-        checkNotNull(tarInputStream, "tarInputStream is null");
-        this.tarInputStream = tarInputStream;
-        return this;
+    public URI getRemote() {
+        return remote;
     }
 
     @Override
-    public BuildImageCmdImpl withTag(String tag) {
-        checkNotNull(tag, "Tag is null");
-        this.tag = tag;
-        return this;
+    public boolean hasNoCacheEnabled() {
+        return noCache;
     }
 
     @Override
-    public String getTag() {
-        return tag;
+    public boolean hasRemoveEnabled() {
+        return remove;
     }
 
     @Override
-    public boolean hasNoCacheEnabled() {
-        return noCache;
+    public boolean isForcerm() {
+        return forcerm != null && forcerm;
     }
 
     @Override
-    public boolean hasRemoveEnabled() {
-        return remove;
+    public Boolean getForcerm() {
+        return forcerm;
     }
 
     @Override
@@ -134,14 +138,50 @@ public String getPathToDockerfile() {
         }
     }
 
+    @Override
+    public Long getMemory() {
+        return memory;
+    }
+
+    @Override
+    public Long getMemswap() {
+        return memswap;
+    }
+
+    @Override
+    public String getCpushares() {
+        return cpushares;
+    }
+
+    @Override
+    public String getCpusetcpus() {
+        return cpusetcpus;
+    }
+
+// getter lib specific
+
     @Override
     public AuthConfigurations getBuildAuthConfigs() {
         return buildAuthConfigs;
     }
 
     @Override
-    public BuildImageCmd withBaseDirectory(File baseDirectory) {
-        this.baseDirectory = baseDirectory;
+    public InputStream getTarInputStream() {
+        return tarInputStream;
+    }
+
+// setters
+
+    @Override
+    public BuildImageCmdImpl withTag(String tag) {
+        checkNotNull(tag, "Tag is null");
+        this.tag = tag;
+        return this;
+    }
+
+    @Override
+    public BuildImageCmd withRemote(URI remote) {
+        this.remote = remote;
         return this;
     }
 
@@ -167,6 +207,17 @@ public BuildImageCmdImpl withRemove(boolean rm) {
         return this;
     }
 
+    @Override
+    public BuildImageCmd withForcerm() {
+        return withForcerm(true);
+    }
+
+    @Override
+    public BuildImageCmd withForcerm(Boolean forcerm) {
+        this.forcerm = forcerm;
+        return this;
+    }
+
     @Override
     public BuildImageCmdImpl withQuiet() {
         return withQuiet(true);
@@ -189,6 +240,67 @@ public BuildImageCmdImpl withPull(boolean pull) {
         return this;
     }
 
+    @Override
+    public BuildImageCmd withMemory(long memory) {
+        this.memory = memory;
+        return this;
+    }
+
+    @Override
+    public BuildImageCmd withMemswap(long memswap) {
+        this.memswap = memswap;
+        return this;
+    }
+
+    @Override
+    public BuildImageCmd withCpushares(String cpushares) {
+        this.cpushares = cpushares;
+        return this;
+    }
+
+    @Override
+    public BuildImageCmd withCpusetcpus(String cpusetcpus) {
+        this.cpusetcpus = cpusetcpus;
+        return this;
+    }
+
+// lib specific
+
+    @Override
+    public BuildImageCmd withBaseDirectory(File baseDirectory) {
+        this.baseDirectory = baseDirectory;
+        return this;
+    }
+
+    @Override
+    public BuildImageCmdImpl withDockerfile(File dockerfile) {
+        checkNotNull(dockerfile);
+        if (!dockerfile.exists())
+            throw new IllegalArgumentException("Dockerfile does not exist");
+        if (!dockerfile.isFile())
+            throw new IllegalArgumentException("Not a directory");
+
+        if (baseDirectory == null)
+            withBaseDirectory(dockerfile.getParentFile());
+
+        this.dockerFile = dockerfile;
+
+        try {
+            withTarInputStream(new Dockerfile(dockerfile).parse().buildDockerFolderTar(baseDirectory));
+        } catch (IOException e) {
+            // we just created the file this should never happen.
+            throw new RuntimeException(e);
+        }
+        return this;
+    }
+
+    @Override
+    public BuildImageCmdImpl withTarInputStream(InputStream tarInputStream) {
+        checkNotNull(tarInputStream, "tarInputStream is null");
+        this.tarInputStream = tarInputStream;
+        return this;
+    }
+
     @Override
     public BuildImageCmd withBuildAuthConfigs(AuthConfigurations authConfigs) {
         checkNotNull(authConfigs, "authConfig is null");
@@ -205,9 +317,6 @@ public void close() throws IOException {
 
     @Override
     public String toString() {
-        return new StringBuilder("build ").append(tag != null ? "-t " + tag + " " : "")
-                .append(noCache ? "--nocache=true " : "").append(quiet ? "--quiet=true " : "")
-                .append(!remove ? "--rm=false " : "").toString();
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SIMPLE_STYLE);
     }
-
 }
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index 7a259b5a1..53c3c5de0 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -19,9 +19,8 @@
 import com.github.dockerjava.jaxrs.async.AbstractCallbackNotifier;
 import com.github.dockerjava.jaxrs.async.POSTCallbackNotifier;
 
-public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem> implements
-        BuildImageCmd.Exec {
-
+public class BuildImageCmdExec extends AbstrAsyncDockerCmdExec<BuildImageCmd, BuildResponseItem>
+        implements BuildImageCmd.Exec {
     private static final Logger LOGGER = LoggerFactory.getLogger(BuildImageCmdExec.class);
 
     public BuildImageCmdExec(WebTarget baseResource) {
@@ -43,23 +42,41 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
         WebTarget webTarget = getBaseResource().path("/build");
         String dockerFilePath = command.getPathToDockerfile();
 
+        if (dockerFilePath != null && command.getRemote() == null && !"Dockerfile".equals(dockerFilePath)) {
+            webTarget = webTarget.queryParam("dockerfile", dockerFilePath);
+        }
         if (command.getTag() != null) {
             webTarget = webTarget.queryParam("t", command.getTag());
         }
+        if (command.getRemote() != null) {
+            webTarget = webTarget.queryParam("remote", command.getRemote().toString());
+        }
+        if (command.isQuiet()) {
+            webTarget = webTarget.queryParam("q", "true");
+        }
         if (command.hasNoCacheEnabled()) {
             webTarget = webTarget.queryParam("nocache", "true");
         }
+        if (command.hasPullEnabled()) {
+            webTarget = webTarget.queryParam("pull", "true");
+        }
         if (!command.hasRemoveEnabled()) {
             webTarget = webTarget.queryParam("rm", "false");
         }
-        if (command.isQuiet()) {
-            webTarget = webTarget.queryParam("q", "true");
+        if (command.isForcerm()) {
+            webTarget = webTarget.queryParam("forcerm", "true");
         }
-        if (command.hasPullEnabled()) {
-            webTarget = webTarget.queryParam("pull", "true");
+        if (command.getMemory() != null) {
+            webTarget = webTarget.queryParam("memory", command.getMemory());
         }
-        if (dockerFilePath != null && !"Dockerfile".equals(dockerFilePath)) {
-            webTarget = webTarget.queryParam("dockerfile", dockerFilePath);
+        if (command.getMemswap() != null) {
+            webTarget = webTarget.queryParam("memswap", command.getMemswap());
+        }
+        if (command.getCpushares() != null) {
+            webTarget = webTarget.queryParam("cpushares", command.getCpushares());
+        }
+        if (command.getCpusetcpus() != null) {
+            webTarget = webTarget.queryParam("cpusetcpus", command.getCpusetcpus());
         }
 
         webTarget.property(ClientProperties.REQUEST_ENTITY_PROCESSING, RequestEntityProcessing.CHUNKED);
@@ -67,8 +84,11 @@ protected AbstractCallbackNotifier<BuildResponseItem> callbackNotifier(BuildImag
 
         LOGGER.trace("POST: {}", webTarget);
 
-        return new POSTCallbackNotifier<BuildResponseItem>(new JsonStreamProcessor<BuildResponseItem>(
-                BuildResponseItem.class), resultCallback, resourceWithOptionalAuthConfig(command, webTarget.request())
-                .accept(MediaType.TEXT_PLAIN), entity(command.getTarInputStream(), "application/tar"));
+        return new POSTCallbackNotifier<>(new JsonStreamProcessor<>(BuildResponseItem.class),
+                resultCallback,
+                resourceWithOptionalAuthConfig(command, webTarget.request())
+                .accept(MediaType.TEXT_PLAIN),
+                entity(command.getTarInputStream(), "application/tar")
+        );
     }
 }