diff --git a/plugins/hypervisors/kvm/agent-descriptor.xml b/plugins/hypervisors/kvm/agent-descriptor.xml
new file mode 100644
index 00000000000..51024a879ef
--- /dev/null
+++ b/plugins/hypervisors/kvm/agent-descriptor.xml
@@ -0,0 +1,68 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  <id>kvm-agent</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>yes</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory></outputDirectory>
+      <useProjectArtifact/>
+    </dependencySet>
+  </dependencySets>
+  <fileSets>
+    <fileSet>
+      <directory>../../../agent/scripts</directory>
+      <outputDirectory></outputDirectory>
+      <fileMode>774</fileMode>
+      <includes>
+      	<include>run.sh</include>
+      	<include>_run.sh</include>
+      	<include>agent.sh</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory></outputDirectory>
+      <fileMode>555</fileMode>
+      <includes>
+      	<include>cloud-plugin-hypervisor-kvm-*.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../../../scripts</directory>
+      <outputDirectory>scripts</outputDirectory>
+      <fileMode>555</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>../../../agent/conf</directory>
+      <outputDirectory>conf</outputDirectory>
+      <directoryMode>555</directoryMode>
+      <fileMode>774</fileMode>
+      <includes>
+      	<include>agent.properties</include>
+      	<include>log4j-cloud.xml</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly> 
diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml
index a192e780c28..d3eca911a04 100644
--- a/plugins/hypervisors/kvm/pom.xml
+++ b/plugins/hypervisors/kvm/pom.xml
@@ -44,4 +44,56 @@
       <version>0.4.9</version>
     </dependency>
   </dependencies>
+  <build>
+      <defaultGoal>install</defaultGoal>
+      <sourceDirectory>src</sourceDirectory>
+      <testSourceDirectory>test</testSourceDirectory>
+       <plugins>
+        <plugin>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>2.3</version>
+          <configuration>
+            <finalName>kvm-agent</finalName>
+            <appendAssemblyId>false</appendAssemblyId>
+            <descriptors>
+              <descriptor>agent-descriptor.xml</descriptor>
+            </descriptors>
+          </configuration>
+          <executions>
+            <execution>
+              <id>make-agent</id>
+              <phase>package</phase>
+              <goals>
+                <goal>single</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.6</version>
+          <executions>
+            <execution>
+              <id>copy-resources</id>
+              <!-- here the phase you need -->
+            <phase>package</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>dist</outputDirectory>
+              <resources>          
+                <resource>
+                  <directory>target</directory>
+                  <includes>
+                    <include>kvm-agent.zip</include>
+                  </includes>
+                </resource>
+              </resources>              
+            </configuration>            
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>