diff --git a/pom.xml b/pom.xml
index ff8162b..e9ff028 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,19 +15,18 @@
 			<groupId>org.bukkit</groupId>
 			<artifactId>bukkit</artifactId>
 			<version>1.2.2-R0.1-SNAPSHOT</version>
-			<type>jar</type>
-			<scope>compile</scope>
+			<scope>provided</scope>
 		</dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <scope>compile</scope>
             <version>20090211</version>
         </dependency>
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
             <version>6.1H.22</version>
+            <scope>test</scope>
         </dependency>
 		<dependency>
 			<groupId>junit</groupId>
@@ -39,26 +38,24 @@
 	<build>
 		<plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.4</version>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                        </manifest>
+                    </archive>
+                    <descriptors>
+                        <descriptor>src/assembly/bukkit.xml</descriptor>
+                    </descriptors>
+                </configuration>
                 <executions>
                     <execution>
-                        <id>unpack</id>
+                        <id>make-assembly</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>unpack</goal>
+                            <goal>single</goal>
                         </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.json</groupId>
-                                    <artifactId>json</artifactId>
-                                    <version>20090211</version>
-                                    <outputDirectory>${project.build.directory}/</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
diff --git a/src/assembly/bukkit.xml b/src/assembly/bukkit.xml
new file mode 100644
index 0000000..9157fb3
--- /dev/null
+++ b/src/assembly/bukkit.xml
@@ -0,0 +1,17 @@
+<assembly>
+    <id>bukkit</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory/>
+            <unpack>true</unpack>
+            <includes>
+                <include>us.camin:Caminus</include>
+                <include>org.json:json</include>
+            </includes>
+        </dependencySet>
+    </dependencySets>
+</assembly>