diff --git a/Mage.Client/release/startClient.bat b/Mage.Client/release/startClient.bat
index 71fc5f89e88..ca6894e1547 100644
--- a/Mage.Client/release/startClient.bat
+++ b/Mage.Client/release/startClient.bat
@@ -9,4 +9,4 @@ set JAVA_HOME="C:\Program Files\Java\jre7\"
 set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
 set PATH=%JAVA_HOME%/bin;%PATH%
 :NOJAVADIR
-start javaw -jar .\lib\mage-client-${project.version}.jar -Xms256M -Xmx1024M -XX:MaxPermSize=384M -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled
\ No newline at end of file
+start javaw -Xms1024m -Xmx1024m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar .\lib\mage-client-${project.version}.jar
\ No newline at end of file
diff --git a/Mage.Client/release/startClient.command b/Mage.Client/release/startClient.command
index 5c1f84ada5b..26dd311156f 100644
--- a/Mage.Client/release/startClient.command
+++ b/Mage.Client/release/startClient.command
@@ -2,4 +2,4 @@
 
 cd "`dirname "$0"`"
 
-java -jar ./lib/mage-client-${project.version}.jar -Xms256M -Xmx1024M -XX:MaxPermSize=256M -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled &
\ No newline at end of file
+java -Xms1024m -Xmx1024m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar ./lib/mage-client-${project.version}.jar &
\ No newline at end of file
diff --git a/Mage.Client/release/startClient.sh b/Mage.Client/release/startClient.sh
index 9acbb830b2e..c5a1f153045 100755
--- a/Mage.Client/release/startClient.sh
+++ b/Mage.Client/release/startClient.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-java -jar ./lib/mage-client-${project.version}.jar -Xms256M -Xmx1024M -XX:MaxPermSize=256M -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled &
\ No newline at end of file
+java -Xms1024m -Xmx1024m -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar ./lib/mage-client-${project.version}.jar &
\ No newline at end of file
diff --git a/Mage.Client/release/startClientWin7.bat b/Mage.Client/release/startClientWin7.bat
index 7e62f2169ba..04b4ac8955c 100644
--- a/Mage.Client/release/startClientWin7.bat
+++ b/Mage.Client/release/startClientWin7.bat
@@ -9,4 +9,4 @@ set JAVA_HOME="C:\Program Files (x86)\Java\jre7\"
 set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
 set PATH=%JAVA_HOME%/bin;%PATH%
 :NOJAVADIR
-start javaw -jar .\lib\mage-client-${project.version}.jar -Xms256M -Xmx1024M -XX:MaxPermSize=384M -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled
\ No newline at end of file
+start javaw -Xms1024m -Xmx1024m -XX:MaxPermSize=384m -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -jar .\lib\mage-client-${project.version}.jar
\ No newline at end of file
diff --git a/Mage.Client/src/main/assembly/distribution.xml b/Mage.Client/src/main/assembly/distribution.xml
index 8e75cf743bb..b59f6bac655 100644
--- a/Mage.Client/src/main/assembly/distribution.xml
+++ b/Mage.Client/src/main/assembly/distribution.xml
@@ -13,6 +13,7 @@
             <includes>
                 <include>org.mage:mage-client</include>
             </includes>
+            <fileMode>0644</fileMode>
         </dependencySet>
         <dependencySet>
             <outputDirectory>/lib/</outputDirectory>
@@ -20,12 +21,14 @@
                 <exclude>org.mage:mage-client</exclude>
                 <exclude>org.mage:mage-counter-plugin</exclude>
             </excludes>
+            <fileMode>0644</fileMode>
         </dependencySet>
         <dependencySet>
             <outputDirectory>/plugins</outputDirectory>
             <includes>
                 <include>org.mage:mage-counter-plugin</include>
             </includes>
+            <fileMode>0644</fileMode>
         </dependencySet>
     </dependencySets>
     <fileSets>
@@ -45,9 +48,17 @@
             <includes>
                 <include>*.bat</include>
                 <include>*.command</include>
+            </includes>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <filtered>true</filtered>
+            <directory>release/</directory>
+            <includes>
                 <include>*.sh</include>
             </includes>
             <outputDirectory>/</outputDirectory>
+            <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
             <filtered>false</filtered>
@@ -64,6 +75,7 @@
                 <include>*.wav</include>
             </includes>
             <outputDirectory>sounds/</outputDirectory>
+            <fileMode>0644</fileMode>
         </fileSet>
 
     </fileSets>
diff --git a/Mage.Server/release/startServer.bat b/Mage.Server/release/startServer.bat
index 6443f2918db..c23f661e732 100644
--- a/Mage.Server/release/startServer.bat
+++ b/Mage.Server/release/startServer.bat
@@ -9,5 +9,5 @@ set JAVA_HOME="C:\Program Files\Java\jre7\"
 set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
 set PATH=%JAVA_HOME%/bin;%PATH%
 :NOJAVADIR
-java -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar -Xms256M -Xmx512M -XX:MaxPermSize=384m
+java -Xms256m -Xmx512m -XX:MaxPermSize=384m -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar
 pause
diff --git a/Mage.Server/release/startServer.command b/Mage.Server/release/startServer.command
index 7026a292194..dca016e9a75 100644
--- a/Mage.Server/release/startServer.command
+++ b/Mage.Server/release/startServer.command
@@ -2,4 +2,4 @@
 
 cd "`dirname "$0"`"
 
-java -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar -Xms256M -Xmx512M -XX:MaxPermSize=256m
+java -Xms256M -Xmx512M -XX:MaxPermSize=256m -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar
diff --git a/Mage.Server/release/startServer.sh b/Mage.Server/release/startServer.sh
index 5db36cd665d..3bac9ce1fad 100755
--- a/Mage.Server/release/startServer.sh
+++ b/Mage.Server/release/startServer.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-java -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar -Xms256M -Xmx512M -XX:MaxPermSize=256m
+java -Xms256M -Xmx512M -XX:MaxPermSize=256m -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar
diff --git a/Mage.Server/release/startServerWin7.bat b/Mage.Server/release/startServerWin7.bat
index a8133b23f8c..f291b447ccc 100644
--- a/Mage.Server/release/startServerWin7.bat
+++ b/Mage.Server/release/startServerWin7.bat
@@ -9,4 +9,4 @@ set JAVA_HOME="C:\Program Files (x86)\Java\jre7\"
 set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
 set PATH=%JAVA_HOME%/bin;%PATH%
 :NOJAVADIR
-java -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar -Xms256M -Xmx512M -XX:MaxPermSize=384m
\ No newline at end of file
+java -Xms256M -Xmx512M -XX:MaxPermSize=384m -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config -Dlog4j.configuration=file:./config/log4j.properties -jar ./lib/mage-server-${project.version}.jar
\ No newline at end of file
diff --git a/Mage.Server/src/main/assembly/distribution.xml b/Mage.Server/src/main/assembly/distribution.xml
index 3d02dc94d46..cf324aec069 100644
--- a/Mage.Server/src/main/assembly/distribution.xml
+++ b/Mage.Server/src/main/assembly/distribution.xml
@@ -53,6 +53,18 @@
             <filtered>true</filtered>
             <directory>release/</directory>
             <outputDirectory>/</outputDirectory>
+            <excludes>
+                <exclude>*.sh</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <filtered>true</filtered>
+            <directory>release/</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>*.sh</include>
+            </includes>
+            <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
             <filtered>false</filtered>