diff --git a/CMakeLists.txt b/CMakeLists.txt
index 625591d..5584e0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,11 @@ set (CMAKE_CXX_STANDARD_REQUIRED ON)
 # Project declaration
 project(Jenjin)
 
+if (WIN32)
+	message(STATUS "Manually enabling unicode support")
+    add_compile_options(/utf-8)
+endif()
+
 add_subdirectory(megasource/libs/)
 add_subdirectory(engine)
 add_subdirectory(jenjin)
diff --git a/megasource b/megasource
index 95ef990..d53551a 160000
--- a/megasource
+++ b/megasource
@@ -1 +1 @@
-Subproject commit 95ef990b935624b1fb819a29fba0591641e84379
+Subproject commit d53551ac4beb861fc36347a10f9966b8903dc674