diff --git a/data/glest_game b/data/glest_game
index 8e0dc1b0..3611cad6 160000
--- a/data/glest_game
+++ b/data/glest_game
@@ -1 +1 @@
-Subproject commit 8e0dc1b0a3f856da10fb66e3b703e79f86a78b18
+Subproject commit 3611cad67a63234d89b69bcda19be447e4f456ee
diff --git a/mk/linux/mg-version.sh b/mk/linux/mg-version.sh
index 6aded2e5..617b285c 100755
--- a/mk/linux/mg-version.sh
+++ b/mk/linux/mg-version.sh
@@ -4,9 +4,9 @@
 # Written by Mark Vejvoda <mark_vejvoda@hotmail.com>
 # Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+
 
-OLD_MG_VERSION=3.9.0
-OLD_MG_VERSION_BINARY=3.9.0
-MG_VERSION=3.9.1
+OLD_MG_VERSION=3.9.1
+OLD_MG_VERSION_BINARY=3.9.1
+MG_VERSION=3.10.0-dev
 
 if [ "$1" = "--oldversion" ]; then
   echo "$OLD_MG_VERSION"
diff --git a/mk/linux/mojosetup/megaglest-installer/scripts/config.lua b/mk/linux/mojosetup/megaglest-installer/scripts/config.lua
index 3bebbbfc..6a51536a 100644
--- a/mk/linux/mojosetup/megaglest-installer/scripts/config.lua
+++ b/mk/linux/mojosetup/megaglest-installer/scripts/config.lua
@@ -1,5 +1,5 @@
 local GAME_INSTALL_SIZE = 730000000;
-local GAME_VERSION = "3.9.1";
+local GAME_VERSION = "3.10.0-dev";
 
 local _ = MojoSetup.translate
 
diff --git a/mk/windoze/Installer/MegaGlestInstaller.nsi b/mk/windoze/Installer/MegaGlestInstaller.nsi
index fcd212a5..684e04e9 100644
--- a/mk/windoze/Installer/MegaGlestInstaller.nsi
+++ b/mk/windoze/Installer/MegaGlestInstaller.nsi
@@ -3,8 +3,8 @@
 
 !define APNAME MegaGlest
 !define APNAME_OLD Mega-Glest
-!define APVER_OLD 3.9.0
-!define APVER 3.9.1
+!define APVER_OLD 3.9.1
+!define APVER 3.10.0-dev
 
 Name "${APNAME} ${APVER}"
 SetCompressor /FINAL /SOLID lzma
diff --git a/mk/windoze/Installer/MegaGlestUpdater.nsi b/mk/windoze/Installer/MegaGlestUpdater.nsi
index 0ce9e642..363426c3 100644
--- a/mk/windoze/Installer/MegaGlestUpdater.nsi
+++ b/mk/windoze/Installer/MegaGlestUpdater.nsi
@@ -2,10 +2,10 @@
 ; General Attributes
 
 !define APNAME MegaGlest
-!define APVER 3.9.1
+!define APVER 3.10.0-dev
 !define APNAME_OLD Mega-Glest
-!define APVER_OLD 3.9.0
-!define APVER_UPDATE 3.9.1
+!define APVER_OLD 3.9.1
+!define APVER_UPDATE 3.10.0-dev
 
 Name "${APNAME} ${APVER_UPDATE}"
 SetCompressor /FINAL /SOLID lzma
diff --git a/source/glest_game/facilities/game_util.cpp b/source/glest_game/facilities/game_util.cpp
index 35e08acc..a6180b30 100644
--- a/source/glest_game/facilities/game_util.cpp
+++ b/source/glest_game/facilities/game_util.cpp
@@ -27,7 +27,7 @@ using namespace Shared::Platform;
 namespace Glest { namespace Game {
 
 const char *mailString				= " http://bugs.megaglest.org";
-const string glestVersionString 	= "v3.9.3-dev";
+const string glestVersionString 	= "v3.10.0-dev";
 #if defined(GITVERSION)
     const string GIT_RawRev			= string(GITVERSION);
     const string GIT_Rev 			= string("Rev: ") + string(GITVERSION);
diff --git a/source/glest_game/types/upgrade_type.cpp b/source/glest_game/types/upgrade_type.cpp
index fbc95d54..812f247d 100644
--- a/source/glest_game/types/upgrade_type.cpp
+++ b/source/glest_game/types/upgrade_type.cpp
@@ -851,9 +851,7 @@ void TotalUpgrade::sum(const UpgradeTypeBase *ut, const Unit *unit) {
 
 	if(ut->getMaxEpIsMultiplier() == true) {
 		maxEp += ((double)unit->getEp() * ((double)ut->getMaxEp() / (double)100));
-		// TODO: SoftCoder - Fix the bug below on next major release
-		// if(ut->getMaxEpRegeneration() != 0) {
-		if(ut->getMaxHpRegeneration() != 0) {
+		if(ut->getMaxEpRegeneration() != 0) {
 			maxEpRegeneration += ((double)unit->getType()->getEpRegeneration() + ((double)max(maxEp,unit->getEp()) * ((double)ut->getMaxEpRegeneration() / (double)100)));
 		}
 	}