diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cde2769b9171..69af8c37240e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,7 +45,7 @@ jobs:
             # Mojave, oldest maintained version as of 2021
             CMAKE_OPTIONS: -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14
           - name: Windows
-            os: windows-latest
+            os: windows-2022
             release: true
             shell: msys2 {0}
             CMAKE_OPTIONS: -G "Unix Makefiles" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
@@ -70,8 +70,8 @@ jobs:
       - name: Install MSYS2
         uses: msys2/setup-msys2@v2
         with:
-          install: make python mingw-w64-x86_64-cmake mingw-w64-x86_64-clang mingw-w64-x86_64-ccache git diffutils
-        if: matrix.os == 'windows-latest'
+          install: make python mingw-w64-x86_64-cmake mingw-w64-x86_64-clang mingw-w64-x86_64-ccache git unzip diffutils binutils
+        if: matrix.os == 'windows-2022'
       - name: Install Brew Packages
         run: |
           brew install ccache
diff --git a/.gitignore b/.gitignore
index f859c5989482..815d256cecf4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,8 @@ settings.json
 CMakeSettings.json
 CppProperties.json
 result
+fwIn.txt
+fwOut.txt
+wdErr.txt
+wdIn.txt
+wdOut.txt
\ No newline at end of file
diff --git a/doc/make/msys2.md b/doc/make/msys2.md
index 5a1f86ec95cf..cf3d493c02a9 100644
--- a/doc/make/msys2.md
+++ b/doc/make/msys2.md
@@ -20,7 +20,7 @@ MSYS2 has a package management system, [pacman][pacman], which is used in Arch L
 Here are the commands to install all dependencies needed to compile Lean on your machine.
 
 ```bash
-pacman -S make mingw-w64-x86_64-cmake mingw-w64-x86_64-ccache mingw-w64-x86_64-gcc git unzip
+pacman -S make python mingw-w64-x86_64-cmake mingw-w64-x86_64-clang mingw-w64-x86_64-ccache git unzip diffutils binutils
 ```
 
 You should now be able to run these commands:
diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
index ec3cb08a6b51..005f20f32338 100644
--- a/src/shell/CMakeLists.txt
+++ b/src/shell/CMakeLists.txt
@@ -1,4 +1,9 @@
-add_library(shell OBJECT lean.cpp)
+set(SRC lean.cpp)
+if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+set(SRC ${SRC} manifest.rc)
+endif()
+
+add_library(shell OBJECT ${SRC})
 
 if(LLVM)
   if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -24,8 +29,8 @@ endif()
 add_custom_target(lean ALL
   WORKING_DIRECTORY ${LEAN_SOURCE_DIR}
   DEPENDS leanshared shell
-  COMMAND $(MAKE) -f ${CMAKE_BINARY_DIR}/stdlib.make lean LEAN_SHELL=$<TARGET_OBJECTS:shell>
-  VERBATIM)
+  COMMAND $(MAKE) -f ${CMAKE_BINARY_DIR}/stdlib.make lean LEAN_SHELL="$<TARGET_OBJECTS:shell>"
+  COMMAND_EXPAND_LISTS)
 
 # use executable of current stage for tests
 string(REGEX REPLACE "^([a-zA-Z]):" "/\\1" LEAN_BIN "${CMAKE_BINARY_DIR}/bin")
diff --git a/src/shell/app.manifest b/src/shell/app.manifest
new file mode 100644
index 000000000000..8f2d71258b2e
--- /dev/null
+++ b/src/shell/app.manifest
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+        <security>
+            <requestedPrivileges>
+                <requestedExecutionLevel level="asInvoker"></requestedExecutionLevel>
+            </requestedPrivileges>
+        </security>
+    </trustInfo>
+    <application>
+        <windowsSettings>
+            <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
+        </windowsSettings>
+    </application>
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+        <application>
+            <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"></supportedOS>
+            <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"></supportedOS>
+            <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"></supportedOS>
+            <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"></supportedOS>
+            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"></supportedOS>
+        </application>
+    </compatibility>
+</assembly>
\ No newline at end of file
diff --git a/src/shell/manifest.rc b/src/shell/manifest.rc
new file mode 100644
index 000000000000..dd76077ec494
--- /dev/null
+++ b/src/shell/manifest.rc
@@ -0,0 +1 @@
+1 /* CREATEPROCESS_MANIFEST_RESOURCE_ID */ 24 /* RT_MANIFEST */ "app.manifest"
\ No newline at end of file
diff --git "a/tests/lean/run/utf8\350\213\261\350\252\236.lean" "b/tests/lean/run/utf8\350\213\261\350\252\236.lean"
new file mode 100644
index 000000000000..1f655d71d564
--- /dev/null
+++ "b/tests/lean/run/utf8\350\213\261\350\252\236.lean"
@@ -0,0 +1,13 @@
+def check_eq {α} [BEq α] [Repr α] (tag : String) (expected actual : α) : IO Unit :=
+  unless (expected == actual) do
+    throw $ IO.userError $
+      s!"assertion failure \"{tag}\":\n  expected: {repr expected}\n  actual:   {repr actual}"
+
+def DecodeUTF8: IO Unit := do
+  let cs := String.toList "Hello, 英語!"
+  let ns := cs.map Char.toNat
+  IO.println cs
+  IO.println ns
+  check_eq "utf-8 chars" [72, 101, 108, 108, 111, 44, 32, 33521, 35486, 33] ns
+
+#eval DecodeUTF8
\ No newline at end of file