diff --git a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java
index fe71864c0..57fb97c7b 100644
--- a/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java
+++ b/docker-java-api/src/main/java/com/github/dockerjava/api/model/Capability.java
@@ -1,5 +1,7 @@
 package com.github.dockerjava.api.model;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+
 /**
  * The Linux capabilities supported by Docker. The list of capabilities is defined in Docker's types.go, {@link #ALL} was added manually.
  *
@@ -299,5 +301,11 @@ public enum Capability {
     /**
      * Trigger something that will wake up the system (set CLOCK_REALTIME_ALARM and CLOCK_BOOTTIME_ALARM timers).
      */
-    WAKE_ALARM
+    WAKE_ALARM;
+
+    @JsonCreator
+    public static Capability fromValue(String cap) {
+        String result = !cap.startsWith("CAP_") ? cap : cap.split("_", 2)[1];
+        return Capability.valueOf(result);
+    }
 }
diff --git a/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java b/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
index aa6167b8c..b0652d945 100644
--- a/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
+++ b/docker-java/src/test/java/com/github/dockerjava/api/model/CapabilityTest.java
@@ -18,6 +18,9 @@ public void serializeCapability() throws Exception {
     public void deserializeCapability() throws Exception {
         Capability capability = JSONTestHelper.getMapper().readValue("\"ALL\"", Capability.class);
         assertEquals(Capability.ALL, capability);
+
+        Capability compatibleCapability = JSONTestHelper.getMapper().readValue("\"CAP_ALL\"", Capability.class);
+        assertEquals(Capability.ALL, compatibleCapability);
     }
 
     @Test(expected = JsonMappingException.class)