diff --git a/Jenkinsfile b/Jenkinsfile
index 89ca744..659cbf3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,9 +29,8 @@ pipeline {
 						label "built-in"
 					}
 					steps {
-						sh("rm -f *.so")
+						sh("git clean -dfx")
 						sh("./configure --enable-opengl --enable-vulkan --without-vulkan-string-helper")
-						sh("make clean")
 						sh("make -j4")
 						sh("mv src/libMw.so libMw64.so")
 						archiveArtifacts("libMw64.so")
@@ -42,9 +41,8 @@ pipeline {
 						label "built-in"
 					}
 					steps {
-						sh("rm -f *.dll *.dll.a")
+						sh("git clean -dfx")
 						sh("./configure --enable-opengl --enable-stb-truetype --disable-freetype2 --cross --target=Windows --host=i686-w64-mingw32")
-						sh("make clean")
 						sh("make -j4")
 						sh("mv src/Mw.dll Mw32.dll")
 						sh("mv src/libMw.dll.a libMw32.dll.a")
@@ -56,9 +54,8 @@ pipeline {
 						label "built-in"
 					}
 					steps {
-						sh("rm -f *.dll *.dll.a")
+						sh("git clean -dfx")
 						sh("./configure --enable-opengl --enable-stb-truetype --disable-freetype2 --cross --target=Windows --host=x86_64-w64-mingw32")
-						sh("make clean")
 						sh("make -j4")
 						sh("mv src/Mw.dll Mw64.dll")
 						sh("mv src/libMw.dll.a libMw64.dll.a")
@@ -70,14 +67,33 @@ pipeline {
 						label "2012r2"
 					}
 					steps {
-						bat("del /s *.dll *.lib")
-						bat("nmake -f NTMakefile clean")
+						bat("git clean -dfx")
 						bat("nmake -f NTMakefile")
 						bat("move /y src\\Mw.dll MwMSVC32.dll")
 						bat("move /y src\\Mw.lib MwMSVC32.lib")
 						archiveArtifacts("MwMSVC32.dll,MwMSVC32.lib")
 					}
 				}
+				stage("Build for Windows 32-bit (MSVC)") {
+					agent {
+						label "built-in"
+					}
+					environment {
+						WATCOM = "/usr/watcom"
+						INCLUDE = "/usr/watcom/h:/usr/watcom/h/nt"
+						PATH = "/usr/watcom/binl64:${env.PATH}"
+					}
+					steps {
+						sh("git clean -dfx")
+						sh("wmake -f WatMakefile")
+						sh("mv src/Mw.dll MwWat32.dll")
+						sh("mv src/Mw.lib MwWat32.lib")
+						archiveArtifacts("MwWat32.dll,MwWat32.lib")
+						sh("./tools/watcom-pack.sh")
+						sh("mv milsko-examples.zip milsko-examples-win32.zip")
+						archiveArtifacts("milsko-examples-win32.zip")
+					}
+				}
 			}
 			post {
 				always {