diff --git a/scripts/wifibroadcast@.service b/scripts/wifibroadcast@.service
index 073d11f7..e364dc1e 100644
--- a/scripts/wifibroadcast@.service
+++ b/scripts/wifibroadcast@.service
@@ -6,7 +6,7 @@ ReloadPropagatedFrom=wifibroadcast.service
 [Service]
 Type=simple
 EnvironmentFile=/etc/default/wifibroadcast
-ExecStart=/usr/bin/python -m telemetry.server %i ${WFB_NICS}
+ExecStart=/usr/bin/wfb-server %i ${WFB_NICS}
 TimeoutStopSec=5s
 Restart=on-failure
 RestartSec=5s
diff --git a/setup.py b/setup.py
index dda21905..1905bba4 100644
--- a/setup.py
+++ b/setup.py
@@ -66,7 +66,8 @@ def _make_spec_file(self):
     packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
     zip_safe=False,
     entry_points={'console_scripts': ['wfb-cli=telemetry.cli:main',
-                                      'wfb-test-latency=telemetry.latency_test:main']},
+                                      'wfb-test-latency=telemetry.latency_test:main',
+                                      'wfb-server=telemetry.server:main']},
     package_data={'telemetry.conf': ['master.cfg', 'site.cfg']},
     data_files = [('/usr/bin', ['wfb_tx', 'wfb_rx', 'wfb_keygen']),
                   ('/lib/systemd/system', ['scripts/storm32.service',