2 files changed, 6 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 3e720971..24ed98aa 100755
--- a/setup.py
+++ b/setup.py
@@ -479,6 +479,7 @@ extra_options = {}
 
 gui_launcher = 'bitmask=leap.bitmask.app:start_app'
 bitmask_cli = 'bitmask_cli=leap.bitmask.cli.bitmask_cli:main'
+bitmaskd = 'bitmaskd=leap.bitmask.core.launcher:run_bitmaskd'
 
 
 setup(
@@ -516,7 +517,7 @@ setup(
     zip_safe=False,
     platforms="all",
     entry_points={
-        'console_scripts': [gui_launcher, bitmask_cli]
+        'console_scripts': [gui_launcher, bitmask_cli, bitmaskd]
     },
     **extra_options
 )
diff --git a/src/leap/bitmask/core/launcher.py b/src/leap/bitmask/core/launcher.py
index 7d658017..e363046e 100644
--- a/src/leap/bitmask/core/launcher.py
+++ b/src/leap/bitmask/core/launcher.py
@@ -35,3 +35,7 @@ def run_bitmaskd():
     ]
     print '[+] launching bitmaskd...'
     run()
+
+
+if __name__ == "__main__":
+    run_bitmaskd()