diff --git a/pom.xml b/pom.xml
index cbfb2c744..548296f9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,20 +28,28 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-  <!-- to add the manifest with the Main-Class -->
+  <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.3.1</version>
-        <configuration>
-          <archive>
-            <manifest>
-              <mainClass>org.bukkit.craftbukkit.Main</mainClass>
-            </manifest>
-          </archive>
-        </configuration>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.4</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>org.bukkit.craftbukkit.Main</mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>