diff --git a/pom.xml b/pom.xml
index 82b7ce822..17bdc7280 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,7 @@
 		<jnr.unixsocket.version>0.3</jnr.unixsocket.version>
 		<bouncycastle.version>1.51</bouncycastle.version>
 		<unix-socket-factory.version>2015-01-27T15-02-14</unix-socket-factory.version>
+		<guava.version>18.0</guava.version>
 
 		<!--test dependencies -->
 		<version.logback>1.1.0</version.logback>
@@ -143,6 +144,12 @@
 			<version>${slf4j-api.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>${guava.version}</version>
+		</dependency>
+
 <!-- 		<dependency> -->
 <!-- 			<groupId>org.slf4j</groupId> -->
 <!-- 			<artifactId>jul-to-slf4j</artifactId> -->
diff --git a/src/main/java/com/github/dockerjava/api/model/Device.java b/src/main/java/com/github/dockerjava/api/model/Device.java
index 63d26b41f..574d1ad56 100644
--- a/src/main/java/com/github/dockerjava/api/model/Device.java
+++ b/src/main/java/com/github/dockerjava/api/model/Device.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.api.model;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
diff --git a/src/main/java/com/github/dockerjava/api/model/EventStreamItem.java b/src/main/java/com/github/dockerjava/api/model/EventStreamItem.java
index 6e6ce035a..5dd9d65c8 100644
--- a/src/main/java/com/github/dockerjava/api/model/EventStreamItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/EventStreamItem.java
@@ -7,7 +7,7 @@
 
 import java.io.Serializable;
 
-import jersey.repackaged.com.google.common.base.Objects;
+import com.google.common.base.Objects;
 
 /**
  * Represents an event stream
diff --git a/src/main/java/com/github/dockerjava/api/model/PushEventStreamItem.java b/src/main/java/com/github/dockerjava/api/model/PushEventStreamItem.java
index f5e845b29..7230a7cef 100644
--- a/src/main/java/com/github/dockerjava/api/model/PushEventStreamItem.java
+++ b/src/main/java/com/github/dockerjava/api/model/PushEventStreamItem.java
@@ -5,7 +5,7 @@
 
 import java.io.Serializable;
 
-import jersey.repackaged.com.google.common.base.Objects;
+import com.google.common.base.Objects;
 
 /**
  * Represents an item returned from push
diff --git a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
index d2dd6d944..bb933f18a 100644
--- a/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
+++ b/src/main/java/com/github/dockerjava/api/model/RestartPolicy.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.api.model;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
index 2eb1ab2a1..aa5f99b0c 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientConfig.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
index 522afe3bf..dd9e566da 100644
--- a/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
+++ b/src/main/java/com/github/dockerjava/core/DockerClientImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.Closeable;
 import java.io.File;
diff --git a/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java b/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
index 7f141142e..ec5a2ba8a 100644
--- a/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/KeystoreSSLConfig.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
index a27cb01f5..bafe62212 100644
--- a/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
+++ b/src/main/java/com/github/dockerjava/core/LocalDirectorySSLConfig.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.Serializable;
 import java.security.Security;
diff --git a/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java b/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
index c1ccab516..31259f1f0 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrAuthCfgDockerCmd.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.IOException;
 
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 300489a0a..751b02cb6 100644
--- a/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
+++ b/src/main/java/com/github/dockerjava/core/command/AbstrDockerCmd.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
index 65155a1a0..fc38ae7d9 100644
--- a/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/AttachContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.InputStream;
 
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 0634651b2..32b5b2f91 100644
--- a/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/BuildImageCmdImpl.java
@@ -26,7 +26,7 @@
 import com.github.dockerjava.core.GoLangMatchFileFilter;
 import com.github.dockerjava.core.dockerfile.Dockerfile;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.*;
+import static com.google.common.base.Preconditions.*;
 
 /**
  * 
diff --git a/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
index df8b1a662..55fe5e2e2 100644
--- a/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CommitCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
index abb6469de..36286423c 100644
--- a/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ContainerDiffCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.List;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
index d335bf8cd..f4f2ae548 100644
--- a/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.InputStream;
 
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 7a41f1d41..0948bf166 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
index 71c333e7c..daa883f94 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateImageCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.InputStream;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
index 3fac90138..65b86ed9a 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecCreateCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.dockerjava.api.NotFoundException;
diff --git a/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
index 70a95b85b..193a2cb69 100644
--- a/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ExecStartCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.InputStream;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
index de7c268c3..9215f233a 100644
--- a/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InspectContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.InspectContainerCmd;
diff --git a/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
index c2c91b996..0b477e80e 100644
--- a/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/InspectImageCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.InspectImageCmd;
diff --git a/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
index ba4da47ce..c6175a8a6 100644
--- a/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/KillContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.KillContainerCmd;
diff --git a/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
index 741da75e7..7144e767f 100644
--- a/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ListContainersCmdImpl.java
@@ -1,7 +1,7 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkArgument;
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.List;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
index ed163bb81..998dded5d 100644
--- a/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/ListImagesCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.List;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
index 547165f11..d405a8026 100644
--- a/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/LogContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.InputStream;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
index a2fd73ee5..5ea60fe86 100644
--- a/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PauseContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.PauseContainerCmd;
diff --git a/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
index 8dd3af41e..d1d4ee026 100644
--- a/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PullImageCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.InputStream;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
index 1914f91dd..a775bffd5 100644
--- a/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/PushImageCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.PushImageCmd;
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
index 51dd4b0c0..7cd063956 100644
--- a/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/RemoveContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.RemoveContainerCmd;
diff --git a/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
index 938e2b81c..87e096aae 100644
--- a/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/RemoveImageCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.RemoveImageCmd;
diff --git a/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
index 3548e04f0..adcac9b4c 100644
--- a/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/RestartContainerCmdImpl.java
@@ -1,7 +1,7 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkArgument;
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.RestartContainerCmd;
diff --git a/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
index 85f7cfe60..6a4596c7d 100644
--- a/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/SaveImageCmdImpl.java
@@ -5,7 +5,7 @@
 
 import java.io.InputStream;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 public class SaveImageCmdImpl extends AbstrAuthCfgDockerCmd<SaveImageCmd, InputStream> implements SaveImageCmd {
     private String name;
diff --git a/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
index 164425fc9..82c94e49f 100644
--- a/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/SearchImagesCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.List;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
index 44476e0ac..c3a5cadaa 100644
--- a/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/StartContainerCmdImpl.java
@@ -1,7 +1,7 @@
 package com.github.dockerjava.core.command;
 
 import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_EMPTY;
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
index bed0aab7f..e961bf8ba 100644
--- a/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/StopContainerCmdImpl.java
@@ -1,7 +1,7 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkArgument;
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.NotModifiedException;
diff --git a/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
index 3e0370cb1..8655ddfe8 100644
--- a/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/TagImageCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.command.TagImageCmd;
 
diff --git a/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
index 713ac2f25..5f7190fb4 100644
--- a/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/TopContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.TopContainerCmd;
diff --git a/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
index ce266162a..92d715bcc 100644
--- a/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/UnpauseContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.api.command.UnpauseContainerCmd;
diff --git a/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
index ecfc89e4e..d6250cc6f 100644
--- a/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/WaitContainerCmdImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.core.command;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.github.dockerjava.api.command.WaitContainerCmd;
 
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
index 72c6c7956..72e85c353 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/Dockerfile.java
@@ -20,11 +20,11 @@
 import java.util.Map;
 import java.util.UUID;
 
-import jersey.repackaged.com.google.common.base.Function;
-import jersey.repackaged.com.google.common.base.Objects;
-import jersey.repackaged.com.google.common.base.Optional;
-import jersey.repackaged.com.google.common.base.Predicate;
-import jersey.repackaged.com.google.common.collect.Collections2;
+import com.google.common.base.Function;
+import com.google.common.base.Objects;
+import com.google.common.base.Optional;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
 
 /**
  * Parse a Dockerfile.
diff --git a/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java b/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
index 1e2ddf1b0..fd22e0985 100644
--- a/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
+++ b/src/main/java/com/github/dockerjava/core/dockerfile/DockerfileStatement.java
@@ -8,8 +8,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import jersey.repackaged.com.google.common.base.Objects;
-import jersey.repackaged.com.google.common.base.Optional;
+import com.google.common.base.Objects;
+import com.google.common.base.Optional;
 
 /**
  * A statement present in a dockerfile.
diff --git a/src/main/java/com/github/dockerjava/core/util/guava/PercentEscaper.java b/src/main/java/com/github/dockerjava/core/util/guava/PercentEscaper.java
index e136ec7b8..1d726dca2 100644
--- a/src/main/java/com/github/dockerjava/core/util/guava/PercentEscaper.java
+++ b/src/main/java/com/github/dockerjava/core/util/guava/PercentEscaper.java
@@ -16,7 +16,7 @@
 
 package com.github.dockerjava.core.util.guava;
 
-import jersey.repackaged.com.google.common.base.Preconditions;
+import com.google.common.base.Preconditions;
 
 /**
  * A {@code UnicodeEscaper} that escapes some set of Java characters using a
diff --git a/src/main/java/com/github/dockerjava/core/util/guava/UnicodeEscaper.java b/src/main/java/com/github/dockerjava/core/util/guava/UnicodeEscaper.java
index 9bee03a71..3631193fc 100644
--- a/src/main/java/com/github/dockerjava/core/util/guava/UnicodeEscaper.java
+++ b/src/main/java/com/github/dockerjava/core/util/guava/UnicodeEscaper.java
@@ -16,7 +16,7 @@
 
 package com.github.dockerjava.core.util.guava;
 
-import jersey.repackaged.com.google.common.base.Preconditions;
+import com.google.common.base.Preconditions;
 
 
 /**
diff --git a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
index a33e11a15..ccb538069 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/AbstrDockerCmdExec.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.jaxrs;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.IOException;
 
diff --git a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
index ed36c62c0..ffbd8306c 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/BuildImageCmdExec.java
@@ -24,7 +24,7 @@
 import com.github.dockerjava.api.model.EventStreamItem;
 import com.github.dockerjava.api.model.PushEventStreamItem;
 
-import jersey.repackaged.com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList;
 
 public class BuildImageCmdExec extends AbstrDockerCmdExec<BuildImageCmd, BuildImageCmd.Response> implements BuildImageCmd.Exec {
 	
diff --git a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
index ced652d70..9df09ba78 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/DockerCmdExecFactoryImpl.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.jaxrs;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.IOException;
 import java.net.URI;
diff --git a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
index 3c525baeb..751145426 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/EventsCmdExec.java
@@ -1,6 +1,6 @@
 package com.github.dockerjava.jaxrs;
 
-import static jersey.repackaged.com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.InputStream;
 import java.util.concurrent.Callable;
diff --git a/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
index 8a9b9ebc9..4d7be3f0a 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/PushImageCmdExec.java
@@ -22,7 +22,7 @@
 import com.github.dockerjava.api.model.PushEventStreamItem;
 
 // Shaded, but imported
-import jersey.repackaged.com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList;
 
 public class PushImageCmdExec extends AbstrDockerCmdExec<PushImageCmd, Response> implements PushImageCmd.Exec {
 	
diff --git a/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java b/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
index 16ad00122..49f50856c 100644
--- a/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
+++ b/src/main/java/com/github/dockerjava/jaxrs/SaveImageCmdExec.java
@@ -6,7 +6,7 @@
 import com.github.dockerjava.api.command.SaveImageCmd;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.PushEventStreamItem;
-import jersey.repackaged.com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;