diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..234e4a0
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,77 @@
+name: build
+
+on: push
+
+jobs:
+  make:
+    name: Make
+
+    runs-on: ubuntu-latest
+
+    env:
+      WATCOM: /opt/watcom
+      EDPATH: /opt/watcom/eddat
+      INCLUDE: /opt/watcom/h:/opt/watcom/lh
+
+    steps:
+      - name: Install build tools
+        run: sudo apt update && sudo apt install build-essential
+      - name: Download OpenWatcom
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          rm -rf /opt/watcom
+          mkdir /opt/watcom
+          wget -qO- https://github.com/open-watcom/open-watcom-v2/releases/download/Current-build/ow-snapshot.tar.gz | tar -xvz -C /opt/watcom
+          echo "/opt/watcom/binl64:/opt/watcom/binl" >> $GITHUB_PATH
+      - uses: actions/checkout@v2
+      - name: Build `cp437`
+        run: |
+          cd ${{ github.workspace }}/cp437
+          gcc cp437.c -o cp437
+      - name: Build `ac97`
+        run: |
+          cd ${{ github.workspace }}/ac97
+          wmake
+      - name: Build `acpi`
+        run: |
+          cd ${{ github.workspace }}/acpi
+          wmake
+      - name: Build `pcireg`
+        run: |
+          cd ${{ github.workspace }}/pcireg
+          wmake
+          make -f Makefile.uefi ARCH=x86_64
+      - uses: actions/upload-artifact@v2
+        with:
+          path: |
+            **/*.EXE
+            **/*.EFI
+
+  newbasic:
+    name: NewBasic
+
+    runs-on: windows-latest
+
+    steps:
+      - name: Download NewBasic assembler
+        run: |
+          Invoke-WebRequest http://www.fysnet.net/zips/nbasm.zip -OutFile nbasm.zip
+          Expand-Archive nbasm.zip -DestinationPath "$env:LOCALAPPDATA/Programs"
+          echo "$env:LOCALAPPDATA/Programs" >> $env:GITHUB_PATH
+      - uses: actions/checkout@v2
+      - name: Build `amikey`
+        run: |
+          cd ${{ github.workspace }}/amikey
+          ./build.bat AMIKEY
+          ./build.bat JETKEY
+      - name: Build `multikey`
+        run: |
+          cd ${{ github.workspace }}/multikey
+          ./build.bat MULTIKEY
+      - name: Build `viakey`
+        run: |
+          cd ${{ github.workspace }}/viakey
+          ./build.bat VIAKEY
+      - uses: actions/upload-artifact@v2
+        with:
+          path: "**/*.COM"
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index c384f87..9afff6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,8 @@ cp437/cp437.exe
 # UEFI
 NvVars
 pci?????.bin
+
+# Binaries
+*.exe
+*.com
+*.efi
\ No newline at end of file
diff --git a/ac97/AC97.EXE b/ac97/AC97.EXE
deleted file mode 100644
index 3f6f665..0000000
Binary files a/ac97/AC97.EXE and /dev/null differ
diff --git a/acpi/ACPI.EXE b/acpi/ACPI.EXE
deleted file mode 100644
index 4524574..0000000
Binary files a/acpi/ACPI.EXE and /dev/null differ
diff --git a/amikey/AMIKEY.COM b/amikey/AMIKEY.COM
deleted file mode 100644
index 457f16e..0000000
Binary files a/amikey/AMIKEY.COM and /dev/null differ
diff --git a/amikey/JETKEY.COM b/amikey/JETKEY.COM
deleted file mode 100644
index 368787c..0000000
Binary files a/amikey/JETKEY.COM and /dev/null differ
diff --git a/clib/watcom.mk b/clib/watcom.mk
index b0ae973..258854c 100644
--- a/clib/watcom.mk
+++ b/clib/watcom.mk
@@ -56,10 +56,10 @@ CFLAGS		= -bt=$(SYSTEM) $(CFLAGS)
 .c.obj
 !if "$(CP437_CONV)" == "y"
 		..$(SLASH)cp437$(SLASH)$(CP437) $<
-		$(CC) $(CFLAGS) $<_cp437
+		$(CC) $(CFLAGS) $<_cp437 -fo=$*.obj
 		@$(DEL) $<_cp437
 !else
-		$(CC) $(CFLAGS) $<
+		$(CC) $(CFLAGS) $< -fo=$*.obj
 !endif
 
 # Default target, which must be the first!
diff --git a/multikey/MULTIKEY.COM b/multikey/MULTIKEY.COM
deleted file mode 100644
index e8d086c..0000000
Binary files a/multikey/MULTIKEY.COM and /dev/null differ
diff --git a/pcireg/PCIIDS.BIN b/pcireg/PCIIDS.BIN
deleted file mode 100644
index efbfbc9..0000000
Binary files a/pcireg/PCIIDS.BIN and /dev/null differ
diff --git a/pcireg/PCIREG.EFI b/pcireg/PCIREG.EFI
deleted file mode 100644
index fc85cc7..0000000
Binary files a/pcireg/PCIREG.EFI and /dev/null differ
diff --git a/pcireg/PCIREG.EXE b/pcireg/PCIREG.EXE
deleted file mode 100644
index ecfd437..0000000
Binary files a/pcireg/PCIREG.EXE and /dev/null differ
diff --git a/viakey/VIAKEY.COM b/viakey/VIAKEY.COM
deleted file mode 100644
index 92fa202..0000000
Binary files a/viakey/VIAKEY.COM and /dev/null differ