diff --git a/Mage.Client/pom.xml b/Mage.Client/pom.xml
index f9aacb0753..a22964dd81 100644
--- a/Mage.Client/pom.xml
+++ b/Mage.Client/pom.xml
@@ -39,7 +39,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.0.2</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
@@ -51,7 +50,26 @@
 					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
-
+                        <plugin>
+                            <artifactId>maven-jar-plugin</artifactId>
+                            <configuration>
+                                 <archive>
+                                    <manifest>
+                                        <addClasspath>true</addClasspath>
+                                        <classpathPrefix>lib/</classpathPrefix>
+                                        <mainClass>mage.client.MageFrame</mainClass>
+                                    </manifest>
+                                </archive>
+                            </configuration>
+                        </plugin>
+                        <plugin>
+                            <artifactId>maven-assembly-plugin</artifactId>
+                            <configuration>
+                                <descriptors>
+                                    <descriptor>src/main/assembly/distribution.xml</descriptor>
+                                </descriptors>                               
+                            </configuration>
+                        </plugin>
 		</plugins>
 
 		<finalName>mage-client</finalName>
diff --git a/Mage.Client/src/main/assembly/distribution.xml b/Mage.Client/src/main/assembly/distribution.xml
new file mode 100644
index 0000000000..71577e03e8
--- /dev/null
+++ b/Mage.Client/src/main/assembly/distribution.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
+                      http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>org.mage:Mage-Client</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>/lib/</outputDirectory>
+    </dependencySet>
+  </dependencySets>
+  <fileSets>
+    <fileSet>
+      <directory>dist/</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>*.sh</include>
+        <include>*.bat</include>
+        <include>*.xml</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>config/</directory>
+      <outputDirectory>config/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>