diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml
index d4e3f252..0647e3e9 100644
--- a/.github/workflows/build-project.yml
+++ b/.github/workflows/build-project.yml
@@ -52,21 +52,36 @@ jobs:
         if: matrix.os == 'windows-latest'
         working-directory: tnc
         run: |      
-          pyinstaller -F daemon.py -n daemon
-          pyinstaller -F main.py -n tnc  
-          #pyinstaller -F --add-binary libcodec2.dll;. --add-binary hamlib/windows/hamlib-4.dll;. --add-binary hamlib/linux/Hamlib.py:. -n tnc main.py
+          pyinstaller -F \
+            daemon.py -n daemon
+          pyinstaller -F \
+            --add-binary lib/codec2/windows/libcodec2.dll;. \
+            --add-binary lib/codec2/windows/libcodec2.dll;./lib/codec2/windows/ \
+            --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/ \
+            main.py -n tnc  
+
+          
 
       - name: LIST ALL FILES
         shell: bash
         run: |
           ls -R  
           
-      - name: Build codec2
-        shell: bash
-        run: |
-          choco install ninja cmake
-          ninja --version
-          cmake --version      
+      #- name: Build codec2
+      #  shell: bash
+      #  run: |
+      #    choco install ninja cmake
+      #    ninja --version
+      #    cmake --version      
           
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v1
@@ -192,9 +207,14 @@ jobs:
         if: matrix.os == 'ubuntu-20.04'
         working-directory: tnc
         run: |      
-          #pyinstaller -F daemon.py -n daemon
-          pyinstaller -F daemon.py --add-binary lib/hamlib/linux/libhamlib.so:./lib/hamlib/linux/ -n daemon
-          pyinstaller -F --add-binary ~/codec2/build_linux/src/libcodec2.so.1.0:. --add-binary lib/hamlib/linux/libhamlib.so:./lib/hamlib/linux/ -n tnc main.py
+
+          pyinstaller -F \
+            --add-binary lib/hamlib/linux/libhamlib.so:./lib/hamlib/linux/ \
+            -n daemon daemon.py
+          pyinstaller -F \
+            --add-binary ~/codec2/build_linux/src/libcodec2.so.1.0:. \
+            --add-binary lib/hamlib/linux/libhamlib.so:./lib/hamlib/linux/ \
+            -n tnc main.py
  
       - name: LIST ALL FILES
         shell: bash