diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index a585bf1e5..bde6fd119 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -18,9 +18,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Download w64devkit
-        run: invoke-webrequest https://github.com/skeeto/w64devkit/releases/download/v1.23.0/w64devkit-i686-1.23.0.zip -outfile ${{github.workspace}}\w64devkit.zip
+        run: invoke-webrequest https://github.com/skeeto/w64devkit/releases/download/v2.0.0/w64devkit-x86-2.0.0.exe -outfile ${{github.workspace}}\w64devkit.exe
       - name: Extract w64devkit
-        run: expand-archive -path ${{github.workspace}}\w64devkit.zip -destinationpath ${{github.workspace}}
+        run: ${{github.workspace}}\w64devkit.exe -y
       - name: Set environment variables and build
         run: |
           $env:Path = "${{github.workspace}}\w64devkit\bin;" + $env:Path
diff --git a/data/licenses/License Attribution.txt b/data/License Attribution.txt
similarity index 100%
rename from data/licenses/License Attribution.txt
rename to data/License Attribution.txt
diff --git a/modules/ctl_doom.lua b/modules/ctl_doom.lua
index fdbb2350b..68a9c03f2 100644
--- a/modules/ctl_doom.lua
+++ b/modules/ctl_doom.lua
@@ -456,7 +456,6 @@ OB_MODULES["doom_mon_control_id24"] =
   game = "doomish",
   engine = "idtech_1",
   port = "!limit_enforcing",
-  port2 = "!edge",
   where = "experimental",
 
   hooks =