diff --git a/Resources/manifest.yml b/Resources/manifest.yml
index 6799118193..88c9243624 100644
--- a/Resources/manifest.yml
+++ b/Resources/manifest.yml
@@ -2,4 +2,9 @@
 windowIconSet: /Textures/Logo/icon
 splashLogo: /Textures/Logo/logo.png
 
+clientAssemblies:
+  - Content.Client
+  - Content.Shared
+  - Content.Shared.Database
+
 # PJB PLEASE
diff --git a/Tools/package_client_build.py b/Tools/package_client_build.py
index 15bc213cb9..fa332416f1 100755
--- a/Tools/package_client_build.py
+++ b/Tools/package_client_build.py
@@ -44,6 +44,7 @@ CLIENT_IGNORED_RESOURCES = {
 }
 
 CLIENT_CONTENT_ASSEMBLIES = [
+    # IF YOU ADD SOMETHING HERE, ADD IT TO MANIFEST.YML TOO.
     "Content.Client",
     "Content.Shared",
     "Content.Shared.Database"