diff --git a/source/glest_game/facilities/game_util.cpp b/source/glest_game/facilities/game_util.cpp
index 4e4af5a2..9d11d010 100644
--- a/source/glest_game/facilities/game_util.cpp
+++ b/source/glest_game/facilities/game_util.cpp
@@ -26,7 +26,7 @@ using namespace Shared::Platform;
 namespace Glest{ namespace Game{
 
 const string mailString= "contact_game@glest.org";
-const string glestVersionString= "v3.3.5-dev";
+const string glestVersionString= "v3.3.5-alpha2";
 
 string getCrashDumpFileName(){
 	return "glest" + glestVersionString + ".dmp";
diff --git a/source/glest_game/menu/menu_state_join_game.cpp b/source/glest_game/menu/menu_state_join_game.cpp
index af603cb7..dc322993 100644
--- a/source/glest_game/menu/menu_state_join_game.cpp
+++ b/source/glest_game/menu/menu_state_join_game.cpp
@@ -504,7 +504,7 @@ void MenuStateJoinGame::connectToServer()
 	Config& config= Config::getInstance();
 	Ip serverIp(labelServerIp.getText());
 
-	clientInterface->connect(serverIp, GameConstants::serverPort);
+	clientInterface->connect(serverIp, Config::getInstance().getInt("ServerPort",intToStr(GameConstants::serverPort).c_str()));
 
 	SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] server - [%s]\n",__FILE__,__FUNCTION__,serverIp.getString().c_str());
 
diff --git a/source/glest_game/menu/menu_state_masterserver.cpp b/source/glest_game/menu/menu_state_masterserver.cpp
index 5bf2294d..9bb2e6c3 100644
--- a/source/glest_game/menu/menu_state_masterserver.cpp
+++ b/source/glest_game/menu/menu_state_masterserver.cpp
@@ -368,8 +368,9 @@ void MenuStateMasterserver::connectToServer(string ipString)
 	Config& config= Config::getInstance();
 	Ip serverIp(ipString);
 
-	SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] try to connect to [%s]\n",__FILE__,__FUNCTION__,serverIp.getString().c_str());
-	clientInterface->connect(serverIp, GameConstants::serverPort);
+	int serverPort = Config::getInstance().getInt("ServerPort",intToStr(GameConstants::serverPort).c_str());
+	SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] try to connect to [%s] serverPort = %d\n",__FILE__,__FUNCTION__,serverIp.getString().c_str(),serverPort);
+	clientInterface->connect(serverIp, serverPort);
 	if(!clientInterface->isConnected())
 	{
 		NetworkManager::getInstance().end();
diff --git a/source/glest_game/network/connection_slot.cpp b/source/glest_game/network/connection_slot.cpp
index ef9af332..553e1be9 100644
--- a/source/glest_game/network/connection_slot.cpp
+++ b/source/glest_game/network/connection_slot.cpp
@@ -297,7 +297,7 @@ void ConnectionSlot::update(bool checkForNewClients) {
                         FileTransferInfo fileInfo;
                         fileInfo.hostType   = eServer;
                         //fileInfo.serverIP   = this->ip.getString();
-                        fileInfo.serverPort = GameConstants::serverPort;
+                        fileInfo.serverPort = Config::getInstance().getInt("ServerPort",intToStr(GameConstants::serverPort).c_str());
                         fileInfo.fileName   = networkMessageSynchNetworkGameDataFileGet.getFileName();
 
                         FileTransferSocketThread *fileXferThread = new FileTransferSocketThread(fileInfo);