diff --git a/pom.xml b/pom.xml
index d1aa152..858884d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,6 +145,33 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+             <createDependencyReducedPom>false</createDependencyReducedPom>
+             <artifactSet>
+                <includes>
+                  <include>org.eclipse.jetty:*</include>
+                </includes>
+              </artifactSet>
+              <relocations>
+                <relocation>
+                  <pattern>org.eclipse.jetty</pattern>
+                  <shadedPattern>${shade.prefix}.org.eclipse.jetty</shadedPattern>
+                </relocation>
+              </relocations>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>      
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -276,6 +303,7 @@
     <java.version>1.7</java.version>
     <jclouds.version>2.1.0</jclouds.version>
     <slf4j.version>1.7.25</slf4j.version>
+    <shade.prefix>${project.groupId}.shaded</shade.prefix>
     <surefire.version>2.20</surefire.version>
   </properties>
 
diff --git a/src/main/assembly/jar-with-dependencies.xml b/src/main/assembly/jar-with-dependencies.xml
index f147ac7..1776e60 100644
--- a/src/main/assembly/jar-with-dependencies.xml
+++ b/src/main/assembly/jar-with-dependencies.xml
@@ -13,6 +13,9 @@
   </containerDescriptorHandlers>
   <dependencySets>
     <dependencySet>
+      <excludes>
+        <exclude>org.eclipse.jetty:*</exclude>
+      </excludes>
       <outputDirectory>/</outputDirectory>
       <useProjectArtifact>true</useProjectArtifact>
       <unpack>true</unpack>
diff --git a/src/main/config/logback.xml b/src/main/config/logback.xml
index 1f603a6..71eb816 100644
--- a/src/main/config/logback.xml
+++ b/src/main/config/logback.xml
@@ -9,6 +9,7 @@
   </appender>
 
   <logger name="org.eclipse.jetty" level="${JETTY_LOG_LEVEL:-info}" />
+  <logger name="org.gaul.shaded.org.eclipse.jetty" level="${JETTY_LOG_LEVEL:-info}" />
 
   <root level="${LOG_LEVEL:-info}">
     <appender-ref ref="STDOUT" />