diff --git a/modules/dist/pom.xml b/modules/dist/pom.xml
index 9971b3c36..62dfb8a51 100644
--- a/modules/dist/pom.xml
+++ b/modules/dist/pom.xml
@@ -78,7 +78,7 @@
         <type>pom</type>
          <scope>provided</scope>
       </dependency>
-    </dependencies>
+  </dependencies>
  
     <build>
       <plugins>
@@ -93,44 +93,44 @@
     </build>
 
     <profiles>
-
-    <!-- 
-    Name:  download
-    Descr: Download WildFly  
-    -->
     <profile>
-      <id>download</id>
+      <id>provisioning</id>
       <activation>
         <property>
           <name>!server.home</name>
         </property>
       </activation>
       <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>unpack</id>
-                <phase>validate</phase>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <configuration>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>org.wildfly</groupId>
-                      <artifactId>wildfly-dist</artifactId>
-                      <version>${jboss.version}</version>
-                      <type>zip</type>
-                      <overWrite>false</overWrite>
-                      <outputDirectory>${project.build.directory}</outputDirectory>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
+          <plugins>
+              <plugin>
+                  <groupId>org.jboss.galleon</groupId>
+                  <artifactId>galleon-maven-plugin</artifactId>
+                  <executions>
+                      <execution>
+                          <id>server-provisioning</id>
+                          <goals>
+                              <goal>provision</goal>
+                          </goals>
+                          <phase>generate-test-resources</phase>
+                          <configuration>
+                              <install-dir>${project.build.directory}/wildfly-${jboss.version}</install-dir>
+                              <record-state>false</record-state>
+                              <offline>false</offline>
+                              <plugin-options>
+                                  <jboss-fork-embedded>true</jboss-fork-embedded>
+                              </plugin-options>
+                              <feature-packs>
+                                  <feature-pack>
+                                      <groupId>org.wildfly</groupId>
+                                      <artifactId>wildfly-ee-galleon-pack</artifactId>
+                                      <version>${jboss.version}</version>
+                                      <inherit-configs>false</inherit-configs>
+                                  </feature-pack>
+                              </feature-packs>
+                          </configuration>
+                      </execution>
+                  </executions>
+              </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-assembly-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 4a9713f4f..61f1c0ce9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,6 +136,9 @@
     <jboss.marshalling.version>2.1.0.Final</jboss.marshalling.version>
     <jboss.marshalling.river.version>${jboss.marshalling.version}</jboss.marshalling.river.version>
     <jboss.ejb.client.version>5.0.1.Final</jboss.ejb.client.version>
+
+    <org.jboss.galleon.version>5.0.7.Final</org.jboss.galleon.version>
+
   </properties>
 
   <!-- licenses -->
@@ -1035,6 +1038,11 @@
           </dependency>
         </dependencies>
       </plugin>
+      <plugin>
+        <groupId>org.jboss.galleon</groupId>
+        <artifactId>galleon-maven-plugin</artifactId>
+        <version>${org.jboss.galleon.version}</version>
+      </plugin>
      </plugins>
   </pluginManagement>
   </build>