diff --git a/cmake/sdl2.cmake b/cmake/sdl2.cmake
index 30908da2..77a96da8 100644
--- a/cmake/sdl2.cmake
+++ b/cmake/sdl2.cmake
@@ -10,6 +10,12 @@ if (UNIX OR MINGW OR WIN32)
   )
   # Also set for consistency with bundled SDL
   set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR})
+  
+  # Add SDL2main for Windows builds when using bundled SDL
+  if(WIN32)
+    list(PREPEND SDL_TARGETS SDL2main ws2_32)
+    add_definitions("-DSDL_MAIN_HANDLED")
+  endif()
 else()
   find_package(SDL2)
   # When using system SDL, use the imported targets
diff --git a/docs/C1-changelog.md b/docs/C1-changelog.md
index 17f9816d..321cde5e 100644
--- a/docs/C1-changelog.md
+++ b/docs/C1-changelog.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 0.3.1 
+## 0.3.1 (September 2025)
 
 ### Major Features
 - **Complete Tile16 Editor Overhaul**: Professional-grade tile editing with modern UI and advanced capabilities