diff --git a/static/build_files/linux/hydrus_client.spec b/static/build_files/linux/hydrus_client.spec
index 9ebf4a71..dc8a46bf 100644
--- a/static/build_files/linux/hydrus_client.spec
+++ b/static/build_files/linux/hydrus_client.spec
@@ -9,19 +9,19 @@ block_cipher = None
 
 a = Analysis(['hydrus/hydrus_client.py'],
              pathex=['.'],
-             binaries=[],
+             binaries=[
+               ('dist/hydrus_server/hydrus_server', '.')
+             ],
              datas=[
                ('hydrus/bin', 'bin'),
                ('hydrus/help', 'help'),
                ('hydrus/static', 'static'),
-               ('dist/hydrus_server/hydrus_server', '.'),
                ('hydrus/license.txt', '.'),
                ('hydrus/README.md', '.'),
                ('hydrus/help my client will not boot.txt', '.'),
                ('hydrus/db', 'db'),
                (cloudscraper_dir, 'cloudscraper')
              ],
-             hiddenimports=['hydrus/hydrus_server.py'],
              hookspath=[],
              runtime_hooks=[],
              excludes=[],
diff --git a/static/build_files/macos/pyoxidizer.bzl b/static/build_files/macos/pyoxidizer.bzl
index 611a200a..cc7208bd 100644
--- a/static/build_files/macos/pyoxidizer.bzl
+++ b/static/build_files/macos/pyoxidizer.bzl
@@ -36,6 +36,9 @@ def make_install(client, resources):
 
     static_resources = glob(["./*.py", "./*.md", "./*txt", "./bin/**/*", "./static/**/*", "./help/**/*"], strip_prefix="{}/".format(CWD))
     files.add_manifest(static_resources)
+    
+    hydrus_source = glob(["./hydrus/**/*.py"], strip_prefix="{}/".format(CWD))
+    files.add_manifest(hydrus_source)
 
     return files
 
diff --git a/static/build_files/windows/hydrus_client.spec b/static/build_files/windows/hydrus_client.spec
index d402aaa7..d201847e 100644
--- a/static/build_files/windows/hydrus_client.spec
+++ b/static/build_files/windows/hydrus_client.spec
@@ -13,19 +13,19 @@ a = Analysis(['hydrus\\hydrus_client.pyw'],
              binaries=[
                ('hydrus\\sqlite3.dll', '.'),
                ('hydrus\\mpv-2.dll', '.')
+               ('dist\\hydrus_server\\hydrus_server.exe*', '.'),
              ],
              datas=[
                ('hydrus\\bin', 'bin'),
                ('hydrus\\help', 'help'),
                ('hydrus\\static', 'static'),
-               ('dist\\hydrus_server\\hydrus_server.exe*', '.'),
                ('hydrus\\license.txt', '.'),
                ('hydrus\\README.md', '.'),
                ('hydrus\\help my client will not boot.txt', '.'),
                ('hydrus\\db', 'db'),
                (cloudscraper_dir, 'cloudscraper')
              ],
-             hiddenimports=['hydrus\\hydrus_server.py', 'cloudscraper'],
+             hiddenimports=['cloudscraper'],
              hookspath=[],
              runtime_hooks=[],
              excludes=[],