diff --git a/setup.py b/setup.py
index 7e6921c..bb187fe 100644
--- a/setup.py
+++ b/setup.py
@@ -69,6 +69,7 @@ setup(
             'eddn-gateway = eddn.Gateway:main',
             'eddn-relay = eddn.Relay:main',
             'eddn-monitor = eddn.Monitor:main',
+            'eddn-bouncer = eddn.Bouncer:main',
         ],
     }
 )
diff --git a/systemd/start-eddn-service b/systemd/start-eddn-service
index cfdd490..ab99fa6 100755
--- a/systemd/start-eddn-service
+++ b/systemd/start-eddn-service
@@ -19,7 +19,7 @@ EXIT_SERVICE_ALREADY_RUNNING=4
 # Print usage information
 ##################################################
 usage() {
-  echo "Usage: $(basename $0) ( live | beta | dev ) ( gateway | monitor | relay | bounce ) [ --from-source [ --background ] ]" >&2
+  echo "Usage: $(basename $0) ( live | beta | dev ) ( gateway | monitor | relay | bouncer ) [ --from-source [ --background ] ]" >&2
 }
 ##################################################
 
@@ -77,6 +77,15 @@ then
   exit ${EXIT_CL_ARGS}
 fi
 SERVICE="${2}"
+case "${SERVICE}" in
+  gateway|monitor|relay|bouncer)
+    ;;
+  *)
+    usage
+    echo "Invalid EDDN service: ${SERVICE}"
+    exit ${EXIT_CL_ARGS}
+    ;;
+esac
 
 if [ ! -z "${3}" ];
 then