diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b1219a1e..367ff20d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -970,24 +970,20 @@ jobs:
       # decompress.
     - name: Cache OpenWatcom and Dependencies
       uses: actions/cache@v4
-      id: cache-watcom-zinc
+      id: cache-zinc
       with:
         path: |
-          ${{github.workspace}}\watcom
+          ${{github.workspace}}\zinc
         key: w32-watcom-1.9+openzinc1
 
-    - name: Get OpenWatcom 1.9 and Dependencies
-      if: steps.cache-watcom-zinc.outputs.cache-hit != 'true'
+    - name: Open Watcom setup
+      uses: open-watcom/setup-watcom@v0
+      with:
+        version: "2.0-64"
+
+    - name: Get zinc
+      if: steps.cache-zinc.outputs.cache-hit != 'true'
       run: |
-        if (Test-Path watcom) {
-            Remove-Item watcom -Force
-        }
-        mkdir watcom
-        cd watcom
-        wget https://github.com/open-watcom/open-watcom-1.9/releases/download/ow1.9/open-watcom-c-win32-1.9.exe -outfile open-watcom-c-win32-1.9.exe
-        7z x open-watcom-c-win32-1.9.exe
-        cd ..
-        
         mkdir zinc
         cd zinc
         wget ${{ env.OPENZINC }} -outfile OZ1.zip
@@ -997,19 +993,6 @@ jobs:
 
     - name: Full Build
       run: |
-        SET PATH=%WATCOM%\BINW;%PATH%
-        SET PATH=%WATCOM%\BINNT;%PATH%
-        SET INCLUDE=%WATCOM%\H\NT;%INCLUDE%
-        SET INCLUDE=%WATCOM%\H\NT;%INCLUDE%
-        SET INCLUDE=%INCLUDE%;C:\WATCOM\H\NT\DIRECTX
-        SET INCLUDE=%INCLUDE%;C:\WATCOM\H\NT\DDK
-        SET INCLUDE=%WATCOM%\H;%INCLUDE%
-        SET EDPATH=%WATCOM%\EDDAT
-        SET WHTMLHELP=%WATCOM%\BINNT\HELP
-        SET WIPFC=%WATCOM%\WIPFC
-
-        call setenv.bat
-        
         REM Enable Dynamic SSH just to be sure those bits are buildable
         REM with OpenWatcom
         set CKF_SSH=yes
@@ -1042,21 +1025,8 @@ jobs:
       working-directory: ${{ github.workspace }}
       env:
         ROOT: ${{ github.workspace }}
-        WATCOM: ${{ github.workspace }}\watcom
     - name: Dialer Build
       run: |
-        SET PATH=%WATCOM%\BINW;%PATH%
-        SET PATH=%WATCOM%\BINNT;%PATH%
-        SET INCLUDE=%WATCOM%\H\NT;%INCLUDE%
-        SET INCLUDE=%WATCOM%\H\NT;%INCLUDE%
-        SET INCLUDE=%INCLUDE%;C:\WATCOM\H\NT\DIRECTX
-        SET INCLUDE=%INCLUDE%;C:\WATCOM\H\NT\DDK
-        SET INCLUDE=%WATCOM%\H;%INCLUDE%
-        SET EDPATH=%WATCOM%\EDDAT
-        SET WHTMLHELP=%WATCOM%\BINNT\HELP
-        SET WIPFC=%WATCOM%\WIPFC
-
-        call setenv.bat
         cd kermit\dialer
         call mk.bat
         call mkdist.bat
@@ -1064,7 +1034,6 @@ jobs:
       working-directory: ${{ github.workspace }}
       env:
         ROOT: ${{ github.workspace }}
-        WATCOM: ${{ github.workspace }}\watcom
     - name: Prepare Artifacts
       shell: cmd
       working-directory: ${{ github.workspace }}\kermit\k95
@@ -1107,41 +1076,15 @@ jobs:
 
         # Cache OpenWatcom because it takes quite a while to download and
         # decompress.
-      - name: Cache OpenWatcom
-        uses: actions/cache@v4
-        id: cache-watcom
+      - name: Open Watcom setup
+        uses: open-watcom/setup-watcom@v0
         with:
-          path: |
-            ${{github.workspace}}\watcom
-          key: nt-watcom-1.9
-      - name: Get OpenWatcom 1.9
-        if: steps.cache-watcom.outputs.cache-hit != 'true'
-        run: |
-          if (Test-Path watcom) {
-            Remove-Item watcom -Force
-          }
-          mkdir watcom
-          cd watcom
-          wget https://github.com/open-watcom/open-watcom-1.9/releases/download/ow1.9/open-watcom-c-win32-1.9.exe -outfile open-watcom-c-win32-1.9.exe
-          7z x open-watcom-c-win32-1.9.exe
-        shell: powershell
+          version: "2.0-64"
       - name: Full Build
         run: |
-          SET PATH=%WATCOM%\BINW;%PATH%
-          SET PATH=%WATCOM%\BINNT;%PATH%
-          SET INCLUDE=%WATCOM%\H\NT;%INCLUDE%
-          SET INCLUDE=%WATCOM%\H\NT;%INCLUDE%
-          SET INCLUDE=%INCLUDE%;C:\WATCOM\H\NT\DIRECTX
-          SET INCLUDE=%INCLUDE%;C:\WATCOM\H\NT\DDK
-          SET INCLUDE=%WATCOM%\H;%INCLUDE%
-          SET EDPATH=%WATCOM%\EDDAT
-          SET WHTMLHELP=%WATCOM%\BINNT\HELP
-          SET WIPFC=%WATCOM%\WIPFC
-          
           REM Build for Windows NT 3.50 (and, someday, NT 3.1)
           set CKT_NT31=yes
-          
-          call ..\setenv.bat
+
           cd p95
           call mknt.bat
           cd ..\k95
@@ -1168,7 +1111,6 @@ jobs:
         working-directory: ${{ github.workspace }}\kermit
         env:
           ROOT: ${{ github.workspace }}
-          WATCOM: ${{ github.workspace }}\watcom
 
       - name: Fetch Docs
         uses: actions/download-artifact@v4
@@ -1205,26 +1147,20 @@ jobs:
 
         # Cache OpenWatcom because it takes quite a while to download and
         # decompress.
-      - name: Cache OpenWatcom
+      - name: Cache zinc
         uses: actions/cache@v4
         id: cache-watcom-zinc
         with:
           path: |
-            ${{github.workspace}}\watcom
             ${{github.workspace}}\zinc
-          key: os2-watcom-1.9+openzinc1+v2
-      - name: Get OpenWatcom 1.9
-        if: steps.cache-watcom-zinc.outputs.cache-hit != 'true'
+          key: os2-openzinc1+v2
+      - name: Open Watcom setup
+        uses: open-watcom/setup-watcom@v0
+        with:
+          version: "2.0-64"
+      - name: Get zinc
+        if: steps.cache-zinc.outputs.cache-hit != 'true'
         run: |
-          if (Test-Path watcom) {
-            Remove-Item watcom -Force
-          }
-          mkdir watcom
-          cd watcom
-          wget https://github.com/open-watcom/open-watcom-1.9/releases/download/ow1.9/open-watcom-c-win32-1.9.exe -outfile open-watcom-c-win32-1.9.exe
-          7z x open-watcom-c-win32-1.9.exe
-          cd ..
-          
           mkdir zinc
           cd zinc
           wget ${{ env.OPENZINC }} -outfile OZ1.zip
@@ -1234,14 +1170,6 @@ jobs:
         shell: powershell
       - name: Kermit/2 Build
         run: |
-          SET PATH=%WATCOM%\BINW;%PATH%
-          SET PATH=%WATCOM%\BINNT;%PATH%
-          SET INCLUDE=%WATCOM%\H;%INCLUDE%
-          SET EDPATH=%WATCOM%\EDDAT
-          SET WHTMLHELP=%WATCOM%\BINNT\HELP
-          SET WIPFC=%WATCOM%\WIPFC
-          
-          call setenv.bat
           cd kermit\k95
           call mkos2.bat
           
@@ -1262,31 +1190,20 @@ jobs:
         working-directory: ${{ github.workspace }}
         env:
           ROOT: ${{ github.workspace }}
-          WATCOM: ${{ github.workspace }}\watcom
       - name: Dialer Build
         run: |
-          SET PATH=%WATCOM%\BINW;%PATH%
-          SET PATH=%WATCOM%\BINNT;%PATH%
-          SET INCLUDE=%WATCOM%\H;%INCLUDE%
-          SET EDPATH=%WATCOM%\EDDAT
-          SET WHTMLHELP=%WATCOM%\BINNT\HELP
-          SET WIPFC=%WATCOM%\WIPFC
-          
-          call setenv.bat
           cd kermit\dialer
           call mkos2.bat
         shell: cmd
         working-directory: ${{ github.workspace }}
         env:
           ROOT: ${{ github.workspace }}
-          WATCOM: ${{ github.workspace }}\watcom
       - name: Make Dialer Distribution
         run: mkdist-os2.bat
         shell: cmd
         working-directory: ${{ github.workspace }}\kermit\dialer
         env:
           ROOT: ${{ github.workspace }}
-          WATCOM: ${{ github.workspace }}\watcom
       - name: Prepare Artifact
         shell: cmd
         working-directory: ${{ github.workspace }}\kermit\k95