diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d8d0600..fd11d23f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,8 @@
 - Zone map image export: colored top-down PNG with terrain, water, objects
 - SQL spawn export for AzerothCore/TrinityCore (creature_template, creature,
   waypoint_data, quest_template — ready-to-import .sql files)
+- Server module generator: one-click AzerothCore module with map registration,
+  spawns, teleport command, zone flags, conf snippet, and admin README
 - Live open format validation (0-7 score) in File menu
 
 ### Novel Open Formats (7/7 Blizzard format replacements)
diff --git a/README.md b/README.md
index 842f7891..08c45570 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,8 @@ cmake --build build --target wowee_editor
 
 Exported zones auto-load in the wowee client from `custom_zones/` or `output/` directories.
 
+**AzerothCore integration**: File > Generate Server Module creates a ready-to-import module with SQL spawn tables, map registration, teleport commands, zone flags, and a server admin README.
+
 ## Features
 
 ### Rendering Engine
diff --git a/tools/editor/editor_ui.cpp b/tools/editor/editor_ui.cpp
index 196d9fea..e866d59f 100644
--- a/tools/editor/editor_ui.cpp
+++ b/tools/editor/editor_ui.cpp
@@ -638,6 +638,7 @@ void EditorUI::renderMenuBar(EditorApp& app) {
             ImGui::BulletText("Ctrl+S — quick save (all formats + collision)");
             ImGui::BulletText("Ctrl+Shift+E — export content pack (.wcp)");
             ImGui::BulletText("File → Batch Convert Assets (M2→WOM, WMO→WOB)");
+            ImGui::BulletText("File → Generate Server Module (AzerothCore SQL)");
             ImGui::BulletText("Minimap: toggle slope overlay for collision preview");
         }
         ImGui::End();