diff --git a/distro/descriptor.xml b/distro/descriptor.xml
index 475e349..406e9fd 100644
--- a/distro/descriptor.xml
+++ b/distro/descriptor.xml
@@ -2,26 +2,12 @@
 	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>
+	<id>bundle</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>INSTALL</include>
-				<include>MAINTAINERS</include>
-				<include>changelog.xml</include>
-			</includes>
-			<fileMode>755</fileMode>
-			<filtered>true</filtered>
-		</fileSet>
 		<fileSet>
 			<directory>${smartgearDirectory}</directory>
 			<outputDirectory>/</outputDirectory>
diff --git a/pom.xml b/pom.xml
index 14d6621..d40489c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,17 +102,41 @@
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.6</version>
 				<executions>
 					<execution>
-						<id>standalone</id>
+						<id>copy-profile</id>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<phase>process-resources</phase>
 						<configuration>
-							<appendAssemblyId>false</appendAssemblyId>
-							<descriptors>
-								<descriptor>${distroDirectory}/descriptor.xml</descriptor>
-							</descriptors>
+							<outputDirectory>${basedir}/${smartgearDirectory}/info</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${distroDirectory}</directory>
+									<filtering>true</filtering>
+								</resource>
+							</resources>
 						</configuration>
-						<phase>install</phase>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.2</version>
+				<configuration>
+					<appendAssemblyId>false</appendAssemblyId>
+					<descriptors>
+						<descriptor>distro/descriptor.xml</descriptor>
+					</descriptors>
+				</configuration>
+				<executions>
+					<execution>
+						<id>bundle</id>
+						<phase>package</phase>
 						<goals>
 							<goal>single</goal>
 						</goals>