diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml
index 0647e3e9..11171e02 100644
--- a/.github/workflows/build-project.yml
+++ b/.github/workflows/build-project.yml
@@ -48,12 +48,27 @@ jobs:
           pip install PyAudio-0.2.11-cp39-cp39-win_amd64.whl
                  
 
-      - name: Build DAEMON and TNC Windows
+      - name: Build Windows Daemon
         if: matrix.os == 'windows-latest'
         working-directory: tnc
         run: |      
           pyinstaller -F \
+            --add-binary lib/hamlib/win32/libgcc_s_sjlj-1.dll;./lib/hamlib/win32/ \
+            --add-binary lib/hamlib/win32/libhamlib-4.dll;./lib/hamlib/win32/ \
+            --add-binary lib/hamlib/win32/libusb-1.0.dll;./lib/hamlib/win32/ \
+            --add-binary lib/hamlib/win32/libwinpthread-1.dll;./lib/hamlib/win32/ \
+            --add-binary lib/hamlib/win32/rigctl.exe;./lib/hamlib/win32/ \
+            --add-binary lib/hamlib/win64/libgcc_s_sjlj-1.dll;./lib/hamlib/win64/ \
+            --add-binary lib/hamlib/win64/libhamlib-4.dll;./lib/hamlib/win64/ \
+            --add-binary lib/hamlib/win64/libusb-1.0.dll;./lib/hamlib/win64/ \
+            --add-binary lib/hamlib/win64/libwinpthread-1.dll;./lib/hamlib/win64/ \
+            --add-binary lib/hamlib/win64/rigctl.exe;./lib/hamlib/win64/ \
             daemon.py -n daemon
+            
+      - name: Build Windows TNC
+        if: matrix.os == 'windows-latest'
+        working-directory: tnc
+        run: |                
           pyinstaller -F \
             --add-binary lib/codec2/windows/libcodec2.dll;. \
             --add-binary lib/codec2/windows/libcodec2.dll;./lib/codec2/windows/ \