diff --git a/changelog.d/11449.feature b/changelog.d/11449.feature
new file mode 100644
index 000000000..94bc175db
--- /dev/null
+++ b/changelog.d/11449.feature
@@ -0,0 +1 @@
+Expose synapse_homeserver and synapse_worker commands as entry points to run Synapse's main process and worker processes, respectively. Contributed by @Ma27.
diff --git a/setup.py b/setup.py
index ad99b3bd2..2c6fb9aac 100755
--- a/setup.py
+++ b/setup.py
@@ -152,6 +152,12 @@ setup(
     long_description=long_description,
     long_description_content_type="text/x-rst",
     python_requires="~=3.6",
+    entry_points={
+        "console_scripts": [
+            "synapse_homeserver = synapse.app.homeserver:main",
+            "synapse_worker = synapse.app.generic_worker:main",
+        ]
+    },
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Topic :: Communications :: Chat",
diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py
index b4bed5bf4..e256de200 100644
--- a/synapse/app/generic_worker.py
+++ b/synapse/app/generic_worker.py
@@ -505,6 +505,10 @@ def start(config_options: List[str]) -> None:
     _base.start_worker_reactor("synapse-generic-worker", config)
 
 
-if __name__ == "__main__":
+def main() -> None:
     with LoggingContext("main"):
         start(sys.argv[1:])
+
+
+if __name__ == "__main__":
+    main()