diff --git a/doc/ChangeLog.html b/doc/ChangeLog.html
index 7f221c983..4ce74e001 100644
--- a/doc/ChangeLog.html
+++ b/doc/ChangeLog.html
@@ -36,6 +36,7 @@
 <li>Future 2.00 Release<p>
     <ul>
     <li>++
+    <li>Fixed Bug #6230: Hack to detect wc2 swamp tileset (from Russell Smith).
     <li>AI tries to move its own units when blocked (from Pollet Ludovic).
     <li>Replay log are now generated for saved/loaded games as well (from Pollet Ludovic).
     <li>Fixed Bug #6466: Can't change between Units/Tile with left mouse after click menu in editor (from Russell Smith).
diff --git a/src/ui/menus.cpp b/src/ui/menus.cpp
index 4390d07a6..4c9ef707a 100644
--- a/src/ui/menus.cpp
+++ b/src/ui/menus.cpp
@@ -6996,27 +6996,6 @@ global void InitMenuData(void)
 */
 global void InitMenuFunctions(void)
 {
-    // FIXME: This must be removed!
-    // FIXME: Use wartool and fix the ccls instead!
-    if (!strcmp(GameName, "wc2")) {
-	Menu *menu;
-
-	//
-	//  FIXME: Hack to disable Expansion Gfx..
-	//
-	strcpy(MenuMapFullPath, StratagusLibPath);
-	if (MenuMapFullPath[0]) {
-	    strcat(MenuMapFullPath, "/graphics/tilesets/");
-	}
-	strcat(MenuMapFullPath, "swamp");
-	if (access(MenuMapFullPath, F_OK) != 0) {
-	    menu = FindMenu("menu-custom-game");
-	    menu->Items[14].d.pulldown.noptions = 4;
-	    menu = FindMenu("menu-multi-setup");
-	    menu->Items[29].d.pulldown.noptions = 4;
-	}
-    }
-
 #ifdef SAVE_MENU_CCL
     {
 	FILE* fd;