diff --git a/pom.xml b/pom.xml
index ca7a182..b556b2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
   <artifactId>rabbitmq</artifactId>
   <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
-  <name>rabbitmq</name>
+  <name>Gerrit RabbitMQ plugin</name>
 
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
@@ -36,6 +36,9 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <version>2.4</version>
+        <configuration>
+          <forceCreation>true</forceCreation>
+        </configuration>
       </plugin>
 
       <plugin>
@@ -51,37 +54,36 @@
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.4</version>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.2</version>
         <executions>
           <execution>
-            <id>make-assembly</id>
             <phase>package</phase>
             <goals>
-              <goal>single</goal>
+              <goal>shade</goal>
             </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <manifestEntries>
+                    <Gerrit-PluginName>${project.artifactId}</Gerrit-PluginName>
+                    <Gerrit-Module>com.googlesource.gerrit.plugins.rabbitmq.Module</Gerrit-Module>
+
+                    <Implementation-Vendor>Gerrit Code Review</Implementation-Vendor>
+                    <Implementation-URL>http://code.google.com/p/gerrit/</Implementation-URL>
+
+                    <Implementation-Title>${Gerrit-ApiType} ${project.artifactId}</Implementation-Title>
+                    <Implementation-Version>${project.version}</Implementation-Version>
+
+                    <Gerrit-ApiType>${Gerrit-ApiType}</Gerrit-ApiType>
+                    <Gerrit-ApiVersion>${Gerrit-ApiVersion}</Gerrit-ApiVersion>
+                  </manifestEntries>
+                </transformer>
+              </transformers>
+              <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
+            </configuration>
           </execution>
         </executions>
-        <configuration>
-          <descriptorRefs>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
-          </descriptorRefs>
-          <archive>
-            <manifestEntries>
-              <Gerrit-PluginName>rabbitmq</Gerrit-PluginName>
-              <Gerrit-Module>com.googlesource.gerrit.plugins.rabbitmq.Module</Gerrit-Module>
-
-              <Implementation-Vendor>Gerrit Code Review</Implementation-Vendor>
-              <Implementation-URL>http://code.google.com/p/gerrit/</Implementation-URL>
-
-              <Implementation-Title>${Gerrit-ApiType} ${project.artifactId}</Implementation-Title>
-              <Implementation-Version>${project.version}</Implementation-Version>
-
-              <Gerrit-ApiType>${Gerrit-ApiType}</Gerrit-ApiType>
-              <Gerrit-ApiVersion>${Gerrit-ApiVersion}</Gerrit-ApiVersion>
-            </manifestEntries>
-          </archive>
-        </configuration>
       </plugin>
 
     </plugins>