diff --git a/core/pom.xml b/core/pom.xml
index e8ea2dc74e..07088e81ff 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,13 +22,13 @@
     -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>jclouds-project</artifactId>
         <groupId>org.jclouds</groupId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../project/pom.xml</relativePath>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>jclouds-core</artifactId>
     <name>jclouds Components Core</name>
     <packaging>jar</packaging>
@@ -94,7 +94,7 @@
             <version>1.0</version>
         </dependency>
         <dependency>
- <groupId>org.mortbay.jetty</groupId>
+            <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
             <version>7.0.0pre3</version>
             <scope>test</scope>
@@ -180,6 +180,53 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptorRefs>
+                                <descriptorRef>jar-with-dependencies</descriptorRef>
+                            </descriptorRefs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>   
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"/>
+                                <jarjar destfile="${build.directory}/${build.finalName}-jar-with-dependencies.jar"
+                                        update="true">
+                                    <!-- Replace "javax.x.y.." with "org.jclouds.repackaged.javax.x.y..".
+                                      See http://code.google.com/p/jarjar/wiki/CommandLineDocs for more informtion on jarjar rules. -->
+                                    <rule pattern="javax.annotation.**" result="${groupId}.repackaged.@0"/>
+                                    <rule pattern="javax.inject.**" result="${groupId}.repackaged.@0"/>
+                                    <rule pattern="javax.ws.**" result="${groupId}.repackaged.@0"/>
+                                </jarjar>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.tonicsystems.jarjar</groupId>
+                        <artifactId>jarjar</artifactId>
+                        <version>1.0-rc8</version>
+                    </dependency>
+                </dependencies>
+            </plugin>                     
         </plugins>
     </build>
 
diff --git a/package.xml b/package.xml
new file mode 100644
index 0000000000..c7ae8ef0dc
--- /dev/null
+++ b/package.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+  <id>package</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+
+  <!-- 
+    Structure:
+      - core (JAR and source JAR)
+      - providers (JARs and source JARs)
+      - extensions (JARs and source JARs)
+      - tools (JARs)
+      - samples (ready to run)
+      - README and licence in the root folder
+      
+    see http://code.google.com/p/jclouds/issues/detail?id=127
+  -->
+  <fileSets>
+    <!-- core -->
+    <fileSet>
+      <directory>core/target</directory>
+      <includes>
+        <include>jclouds-core-${project.version}-jar-with-dependencies.jar</include>
+        <include>jclouds-core-${project.version}-sources.jar</include>
+      </includes>
+      <outputDirectory>core</outputDirectory>
+    </fileSet>
+    
+    <!-- providers -->
+    <fileSet>
+      <directory>atmos/target</directory>
+      <includes>
+        <include>jclouds-atmos-${project.version}.jar</include>
+        <include>jclouds-atmos-${project.version}-sources.jar</include>
+      </includes>
+      <outputDirectory>providers/atmos</outputDirectory>
+    </fileSet>     
+    <fileSet>
+      <directory>aws/core/target</directory>
+      <includes>
+        <include>jclouds-aws-${project.version}.jar</include>
+        <include>jclouds-aws-${project.version}-sources.jar</include>
+      </includes>
+      <outputDirectory>providers/aws</outputDirectory>
+    </fileSet> 
+    <fileSet>
+      <directory>azure/target</directory>
+      <includes>
+        <include>jclouds-azure-${project.version}.jar</include>
+        <include>jclouds-azure-${project.version}-sources.jar</include>
+      </includes>
+      <outputDirectory>providers/azure</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>mezeo/pcs2/core/target</directory>
+      <includes>
+        <include>jclouds-pcs-${project.version}.jar</include>
+        <include>jclouds-pcs-${project.version}-sources.jar</include>
+      </includes>
+      <outputDirectory>providers/mezeo</outputDirectory>
+    </fileSet> 
+    <fileSet>
+      <directory>rackspace/target</directory>
+      <includes>
+        <include>jclouds-rackspace-${project.version}.jar</include>
+        <include>jclouds-rackspace-${project.version}-sources.jar</include>
+      </includes>
+      <outputDirectory>providers/rackspace</outputDirectory>
+    </fileSet>  
+    <fileSet>
+      <directory>rimuhosting/target</directory>
+      <includes>
+        <include>jclouds-rimuhosting-${project.version}.jar</include>
+        <include>jclouds-rimuhosting-${project.version}-sources.jar</include>
+      </includes>
+      <outputDirectory>providers/rimuhosting</outputDirectory>
+    </fileSet> 
+    <fileSet>
+      <directory>nirvanix/sdn/core/target</directory>
+      <includes>
+        <include>jclouds-sdn-${project.version}.jar</include>
+        <include>jclouds-sdn-${project.version}-sources.jar</include>
+      </includes>
+      <outputDirectory>providers/nirvanix</outputDirectory>
+    </fileSet>  
+    <fileSet>
+      <directory>vcloud/core/target</directory>
+      <includes>
+        <include>jclouds-vcloud-${project.version}.jar</include>
+        <include>jclouds-vcloud-${project.version}-sources.jar</include>
+      </includes>
+      <outputDirectory>providers/vcloud</outputDirectory>
+    </fileSet> 
+    <fileSet>
+      <directory>vcloud/hostingdotcom/target</directory>
+      <includes>
+        <include>jclouds-hostingdotcom-${project.version}.jar</include>
+        <include>jclouds-hostingdotcom-${project.version}-sources.jar</include>
+      </includes>
+      <outputDirectory>providers/vcloud</outputDirectory>
+    </fileSet>      
+    <fileSet>
+      <directory>vcloud/terremark/target</directory>
+      <includes>
+        <include>jclouds-terremark-${project.version}.jar</include>
+        <include>jclouds-terremark-${project.version}-sources.jar</include>
+      </includes>
+      <outputDirectory>providers/vcloud</outputDirectory>
+    </fileSet>   
+    <fileSet>
+      <directory>twitter/target</directory>
+      <includes>
+        <include>jclouds-twitter-${project.version}.jar</include>
+        <include>jclouds-twitter-${project.version}-sources.jar</include>
+      </includes>
+      <outputDirectory>providers/twitter</outputDirectory>
+    </fileSet> 
+    
+    <!-- extensions -->
+    <fileSet>
+      <directory>extensions/gae/target</directory>
+      <includes>
+        <include>jclouds-gae-${project.version}.jar</include>
+        <include>jclouds-gae-${project.version}-sources.jar</include>
+      </includes>
+      <outputDirectory>extensions/gae</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>extensions/httpnio/target</directory>
+      <includes>
+        <include>jclouds-httpnio-${project.version}.jar</include>
+        <include>jclouds-httpnio-${project.version}-sources.jar</include>
+      </includes>
+      <outputDirectory>extensions/httpnio</outputDirectory>
+    </fileSet>  
+    <fileSet>
+      <directory>extensions/ssh/jsch/target</directory>
+      <includes>
+        <include>jclouds-jsch-${project.version}.jar</include>
+        <include>jclouds-jsch-${project.version}-sources.jar</include>
+      </includes>
+      <outputDirectory>extensions/ssh</outputDirectory>
+    </fileSet> 
+    <fileSet>
+      <directory>extensions/log4j/target</directory>
+      <includes>
+        <include>jclouds-log4j-${project.version}.jar</include>
+        <include>jclouds-log4j-${project.version}-sources.jar</include>
+      </includes>
+      <outputDirectory>extensions/log4j</outputDirectory>
+    </fileSet>       
+    <fileSet>
+      <directory>aws/extensions/jets3t/target</directory>
+      <includes>
+        <include>jclouds-jets3t-${project.version}.jar</include>
+        <include>jclouds-jets3t-${project.version}-sources.jar</include>
+      </includes>
+      <outputDirectory>extensions/aws</outputDirectory>
+    </fileSet>  
+    
+    <!-- tools -->
+    <fileSet>
+      <directory>tools/ant-plugin/target</directory>
+      <includes>
+        <include>jclouds-ant-plugin-${project.version}.jar</include>
+        <include>jclouds-ant-plugin-${project.version}-sources.jar</include>
+      </includes>
+      <outputDirectory>tools/ant</outputDirectory>
+    </fileSet>     
+    
+    <!-- samples -->
+    <fileSet>
+      <directory>demos</directory>
+      <excludes>
+        <exclude>.svnignore</exclude>
+        <!-- exclude only the *root* POM -->
+        <exclude>pom.xml</exclude>
+      </excludes>
+      <outputDirectory>samples</outputDirectory>
+    </fileSet>
+  </fileSets>
+  
+  <!-- "loose" files -->
+  <files>
+    <file>
+      <source>README.txt</source>
+      <lineEnding>unix</lineEnding>
+      <filtered>true</filtered>
+      <outputDirectory />
+    </file>  
+    <file>
+      <source>project/LICENSE.txt</source>
+      <lineEnding>unix</lineEnding>
+      <filtered>true</filtered>
+      <outputDirectory />
+    </file>
+  </files>  
+</assembly>
diff --git a/pom.xml b/pom.xml
index 7143c3cb6c..f44af4aeba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,31 +26,32 @@
    ====================================================================
  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>jclouds-project</artifactId>
         <groupId>org.jclouds</groupId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>project/pom.xml</relativePath>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>jclouds-multi</artifactId>
-    <packaging>pom</packaging>
     <name>jclouds</name>
+    <packaging>pom</packaging>
     <modules>
         <module>project</module>
-        <module>archetypes</module>        
+        <module>archetypes</module>
+        <module>thirdparty</module>
         <module>core</module>
         <module>extensions</module>
+        <module>scriptbuilder</module>
+        <module>atmos</module>        
         <module>aws</module>
         <module>azure</module>
-        <module>rackspace</module>
-        <module>mezeo</module>
+        <module>mezeo</module>        
         <module>nirvanix</module>
-        <module>thirdparty</module>
+        <module>rackspace</module>
+        <module>rimuhosting</module>        
         <module>twitter</module>
-        <module>rimuhosting</module>
         <module>vcloud</module>
-        <module>scriptbuilder</module>
     </modules>
     <build>
         <plugins>
@@ -104,6 +105,25 @@ pageTracker._trackPageview();
                     </properties>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <inherited>false</inherited>
+                <executions>
+                    <execution>
+                        <id>create-package</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <finalName>jclouds-${project.version}</finalName>
+                            <descriptors>
+                                <descriptor>package.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>            
         </plugins>
     </build>
 </project>