diff --git a/.github/toolchains/common-w64-mingw32.cmake b/.github/toolchains/common-w64-mingw32.cmake
new file mode 100644
index 0000000..7fcee75
--- /dev/null
+++ b/.github/toolchains/common-w64-mingw32.cmake
@@ -0,0 +1,16 @@
+set(BUILD_STATIC ON)
+
+set(CMAKE_SYSTEM_NAME Windows)
+set(CMAKE_SYSROOT /usr/${TARGET})
+
+set(CMAKE_C_COMPILER ${TARGET}-gcc)
+set(CMAKE_CXX_COMPILER ${TARGET}-g++)
+
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+
+set(ENV{PKG_CONFIG_LIBDIR} ${CMAKE_SYSROOT}/lib/pkgconfig:${CMAKE_SYSROOT}/share/pkgconfig)
+set(ENV{PKG_CONFIG_PATH} $ENV{PKG_CONFIG_LIBDIR})
+
+set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
diff --git a/.github/toolchains/i686-w64-mingw32.cmake b/.github/toolchains/i686-w64-mingw32.cmake
new file mode 100644
index 0000000..7d1612a
--- /dev/null
+++ b/.github/toolchains/i686-w64-mingw32.cmake
@@ -0,0 +1,2 @@
+set(TARGET i686-w64-mingw32)
+include(${CMAKE_CURRENT_LIST_DIR}/common-w64-mingw32.cmake)
diff --git a/.github/toolchains/x86_64-w64-mingw32.cmake b/.github/toolchains/x86_64-w64-mingw32.cmake
index 08e3281..cab56f4 100644
--- a/.github/toolchains/x86_64-w64-mingw32.cmake
+++ b/.github/toolchains/x86_64-w64-mingw32.cmake
@@ -1,18 +1,2 @@
 set(TARGET x86_64-w64-mingw32)
-
-set(BUILD_STATIC ON)
-
-set(CMAKE_SYSTEM_NAME Windows)
-set(CMAKE_SYSROOT /usr/${TARGET})
-
-set(CMAKE_C_COMPILER ${TARGET}-gcc)
-set(CMAKE_CXX_COMPILER ${TARGET}-g++)
-
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-
-set(ENV{PKG_CONFIG_LIBDIR} ${CMAKE_SYSROOT}/lib/pkgconfig:${CMAKE_SYSROOT}/share/pkgconfig)
-set(ENV{PKG_CONFIG_PATH} $ENV{PKG_CONFIG_LIBDIR})
-
-set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+include(${CMAKE_CURRENT_LIST_DIR}/common-w64-mingw32.cmake)
diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index 5d6d655..dcba86a 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -22,6 +22,11 @@ jobs:
             packages: ['g++-mingw-w64-x86-64', 'libz-mingw-w64-dev']
             prefix: '/usr/x86_64-w64-mingw32'
             build_libpng: true
+          - host: 'i686-w64-mingw32'
+            label: 'Win32'
+            packages: ['g++-mingw-w64-i686', 'libz-mingw-w64-dev']
+            prefix: '/usr/i686-w64-mingw32'
+            build_libpng: true
 
     env:
       CMAKE_TOOLCHAIN_FILE: '${{ github.workspace }}/.github/toolchains/${{ matrix.host }}.cmake'