diff --git a/distro/descriptor.xml b/distro/descriptor.xml
new file mode 100644
index 0000000..a01bf47
--- /dev/null
+++ b/distro/descriptor.xml
@@ -0,0 +1,30 @@
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+	<id>portal</id>
+	<formats>
+		<format>tar.gz</format>
+	</formats>
+	<baseDirectory>/</baseDirectory>
+	<fileSets>
+		<fileSet>
+			<directory>${distroDirectory}</directory>
+			<outputDirectory>/META-INF</outputDirectory>
+			<useDefaultExcludes>true</useDefaultExcludes>
+			<includes>
+				<include>README</include>
+				<include>LICENSE</include>
+				<include>changelog.xml</include>
+			</includes>
+			<fileMode>755</fileMode>
+			<filtered>true</filtered>
+		</fileSet>		
+		<fileSet>
+			<directory>Portal-Bundle</directory>
+			<outputDirectory>/</outputDirectory>
+			<useDefaultExcludes>true</useDefaultExcludes>
+			<fileMode>755</fileMode>
+		</fileSet>
+	</fileSets>
+</assembly>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 72dd379..ad6a578 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,7 @@
 	</developers>
 	<properties>
 		<tomcat.version>7.0.62</tomcat.version>
+		<distroDirectory>distro</distroDirectory>
 		<!-- As long as we do not automatize this make sure the version correspond 
 			with the enabling portlets one -->
 
@@ -249,6 +250,25 @@
 					</replacements>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<appendAssemblyId>false</appendAssemblyId>
+					<descriptors>
+						<descriptor>distro/descriptor.xml</descriptor>
+					</descriptors>
+				</configuration>
+				<executions>
+					<execution>
+						<id>portal</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 		<!-- Transitives to be excluded -->