diff --git a/.github/workflows/test-keytools-msys2.yml b/.github/workflows/test-keytools-msys2.yml
new file mode 100644
index 00000000..e8d2b9c9
--- /dev/null
+++ b/.github/workflows/test-keytools-msys2.yml
@@ -0,0 +1,39 @@
+name: Wolfboot keytools with MSYS2
+
+on:
+  push:
+    branches: [ 'master', 'main', 'release/**' ]
+  pull_request:
+    branches: [ '*' ]
+
+jobs:
+
+  build:
+    runs-on: windows-latest
+
+    steps:
+      - name: Setup MSYS2
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          update: true
+          install: base-devel git
+          pacboy: toolchain:p
+
+      - name: git config
+        shell: bash
+        run: |
+          git config --global core.autocrlf input
+
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Build tools
+        shell: msys2 {0}
+        run: |
+          make distclean
+          cp config/examples/sim.config .config
+          make include/target.h
+          make -C tools/keytools
+          make -C tools/bin-assemble
diff --git a/lib/wolfssl b/lib/wolfssl
index cd02d514..dc7e0441 160000
--- a/lib/wolfssl
+++ b/lib/wolfssl
@@ -1 +1 @@
-Subproject commit cd02d5140fccd2478dcd4845d1b7cef6be881dde
+Subproject commit dc7e044157dc05906e7993087b3d99cfed88b0d7