diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 34682a14f..4fc7f5f32 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -126,6 +126,9 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
     @CheckForNull
     Long getMemorySwap();
 
+    @CheckForNull
+    Integer getMemorySwappiness();
+
     @CheckForNull
     String getName();
 
@@ -368,6 +371,8 @@ public interface CreateContainerCmd extends SyncDockerCmd<CreateContainerRespons
 
     CreateContainerCmd withMemorySwap(Long memorySwap);
 
+    CreateContainerCmd withMemorySwappiness(Integer memorySwappiness);
+
     CreateContainerCmd withName(String name);
 
     CreateContainerCmd withNetworkDisabled(Boolean disableNetwork);
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index f7e2fc410..a1f4090ba 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -363,6 +363,12 @@ public Long getMemorySwap() {
         return hostConfig.getMemorySwap();
     }
 
+    @Override
+    @JsonIgnore
+    public Integer getMemorySwappiness() {
+        return hostConfig.getMemorySwappiness();
+    }
+
     @Override
     public String getName() {
         return name;
@@ -816,6 +822,13 @@ public CreateContainerCmd withMemorySwap(Long memorySwap) {
         return this;
     }
 
+    @Override
+    public CreateContainerCmd withMemorySwappiness(Integer memorySwappiness) {
+        checkNotNull(memorySwappiness, "memorySwappiness was not specified");
+        hostConfig.withMemorySwappiness(memorySwappiness);
+        return this;
+    }
+
     @Override
     public CreateContainerCmd withName(String name) {
         checkNotNull(name, "name was not specified");
diff --git a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
index 070498a4f..c49cbd8d4 100644
--- a/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
+++ b/src/test/java/com/github/dockerjava/cmd/CreateContainerCmdIT.java
@@ -70,6 +70,7 @@
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assume.assumeThat;
 
 @NotThreadSafe
@@ -294,6 +295,25 @@ public void createContainerWithLink() throws DockerException {
                 "container1Link")}));
     }
 
+    @Test
+    public void createContainerWithMemorySwappiness() throws DockerException {
+        CreateContainerResponse container = dockerRule.getClient().createContainerCmd(DEFAULT_IMAGE)
+                .withCmd("sleep", "9999")
+                .withMemorySwappiness(42)
+                .exec();
+        assertThat(container.getId(), not(isEmptyString()));
+        LOG.info("Created container {}", container.toString());
+
+        dockerRule.getClient().startContainerCmd(container.getId()).exec();
+        LOG.info("Started container {}", container.toString());
+
+        InspectContainerResponse inspectContainerResponse = dockerRule.getClient()
+                .inspectContainerCmd(container.getId())
+                .exec();
+        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
+        assertSame(42, inspectContainerResponse.getHostConfig().getMemorySwappiness());
+    }
+
     @Test
     public void createContainerWithLinkInCustomNetwork() throws DockerException {
         String containerName1 = "containerCustomlink_" + dockerRule.getKind();