diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp
index 0c3cafd46..0d9d2d1a0 100644
--- a/source/glest_game/menu/menu_state_custom_game.cpp
+++ b/source/glest_game/menu/menu_state_custom_game.cpp
@@ -2698,9 +2698,14 @@ void MenuStateCustomGame::publishToMasterserver() {
 	//ip is automatically set
 
 	//game setup info:
-	publishToServerInfo["tech"] = listBoxTechTree.getSelectedItem();
-	publishToServerInfo["map"] = listBoxMap.getSelectedItem();
-	publishToServerInfo["tileset"] = listBoxTileset.getSelectedItem();
+
+	//publishToServerInfo["tech"] = listBoxTechTree.getSelectedItem();
+    publishToServerInfo["tech"] = techTreeFiles[listBoxTechTree.getSelectedItemIndex()];
+	//publishToServerInfo["map"] = listBoxMap.getSelectedItem();
+    publishToServerInfo["map"] = getCurrentMapFile();
+	//publishToServerInfo["tileset"] = listBoxTileset.getSelectedItem();
+    publishToServerInfo["tileset"] = tilesetFiles[listBoxTileset.getSelectedItemIndex()];
+
 	publishToServerInfo["activeSlots"] = intToStr(slotCountUsed);
 	publishToServerInfo["networkSlots"] = intToStr(slotCountHumans);
 	publishToServerInfo["connectedClients"] = intToStr(slotCountConnectedPlayers);
diff --git a/source/glest_game/network/server_interface.cpp b/source/glest_game/network/server_interface.cpp
index a6380e610..69ca4d34f 100644
--- a/source/glest_game/network/server_interface.cpp
+++ b/source/glest_game/network/server_interface.cpp
@@ -2339,7 +2339,7 @@ std::map<string,string> ServerInterface::publishToMasterserver() {
 		}
 	}
 	publishToServerInfo["glestVersion"] = glestVersionString;
-	publishToServerInfo["platform"] = getPlatformNameString();
+	publishToServerInfo["platform"] = getPlatformNameString() + "-" + getSVNRevisionString();
 	publishToServerInfo["binaryCompileDate"] = getCompileDateTime();
 	publishToServerInfo["serverTitle"] = getHumanPlayerName() + "'s game";
 	publishToServerInfo["tech"] = this->getGameSettings()->getTech();