diff --git a/Mage.Client/release/startClient.bat b/Mage.Client/release/startClient.bat
index 43a977108f6..71fc5f89e88 100644
--- a/Mage.Client/release/startClient.bat
+++ b/Mage.Client/release/startClient.bat
@@ -1,7 +1,12 @@
 @ECHO OFF
-IF NOT EXIST "C:\Program Files\Java\jre6" GOTO NOJAVADIR
+IF NOT EXIST "C:\Program Files\Java\jre6" GOTO JAVA7
 set JAVA_HOME="C:\Program Files\Java\jre6"
 set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
 set PATH=%JAVA_HOME%/bin;%PATH%
+:JAVA7
+IF NOT EXIST "C:\Program Files\Java\jre7\bin\" GOTO NOJAVADIR
+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=256M -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled
\ No newline at end of file
+start javaw -jar .\lib\mage-client-${project.version}.jar -Xms256M -Xmx1024M -XX:MaxPermSize=384M -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled
\ No newline at end of file
diff --git a/Mage.Client/release/startClientWin7.bat b/Mage.Client/release/startClientWin7.bat
index ca2e1dabeec..7e62f2169ba 100644
--- a/Mage.Client/release/startClientWin7.bat
+++ b/Mage.Client/release/startClientWin7.bat
@@ -1,7 +1,12 @@
 @ECHO OFF
-IF NOT EXIST "C:\Program Files (x86)\Java\jre6\bin\" GOTO NOJAVADIR
+IF NOT EXIST "C:\Program Files (x86)\Java\jre6\bin\" GOTO JAVA7
 set JAVA_HOME="C:\Program Files (x86)\Java\jre6\"
 set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
 set PATH=%JAVA_HOME%/bin;%PATH%
+:JAVA7
+IF NOT EXIST "C:\Program Files (x86)\Java\jre7\bin\" GOTO NOJAVADIR
+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=256M -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled
\ No newline at end of file
+start javaw -jar .\lib\mage-client-${project.version}.jar -Xms256M -Xmx1024M -XX:MaxPermSize=384M -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled
\ No newline at end of file
diff --git a/Mage.Server/release/startServer.bat b/Mage.Server/release/startServer.bat
index 789cd7bce67..6443f2918db 100644
--- a/Mage.Server/release/startServer.bat
+++ b/Mage.Server/release/startServer.bat
@@ -1,3 +1,13 @@
 @ECHO OFF
-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
+IF NOT EXIST "C:\Program Files\Java\jre6" GOTO JAVA7
+set JAVA_HOME="C:\Program Files\Java\jre6"
+set CLASSPATH=%JAVA_HOME%/bin;%CLASSPATH%
+set PATH=%JAVA_HOME%/bin;%PATH%
+:JAVA7
+IF NOT EXIST "C:\Program Files\Java\jre7\bin\" GOTO NOJAVADIR
+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
 pause
diff --git a/Mage.Server/release/startServerWin7.bat b/Mage.Server/release/startServerWin7.bat
index 79a72e68b0a..a8133b23f8c 100644
--- a/Mage.Server/release/startServerWin7.bat
+++ b/Mage.Server/release/startServerWin7.bat
@@ -1,7 +1,12 @@
 @ECHO OFF
-IF NOT EXIST "C:\Program Files (x86)\Java\jre6\bin\" GOTO NOJAVADIR
+IF NOT EXIST "C:\Program Files (x86)\Java\jre6\bin\" GOTO JAVA7
 set JAVA_HOME="C:\Program Files (x86)\Java\jre6\"
 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=256m
\ No newline at end of file
+:JAVA7
+IF NOT EXIST "C:\Program Files (x86)\Java\jre7\bin\" GOTO NOJAVADIR
+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