diff --git a/bin/synergy b/bin/synergy
index d1cae6d..9faf24a 100644
--- a/bin/synergy
+++ b/bin/synergy
@@ -3,7 +3,7 @@
 
 import sys
 
-from synergy.service import main
+from synergy.client.shell import main
 
 
 if __name__ == "__main__":
diff --git a/bin/synergy-service b/bin/synergy-service
new file mode 100644
index 0000000..d1cae6d
--- /dev/null
+++ b/bin/synergy-service
@@ -0,0 +1,10 @@
+#!/usr/bin/python
+# PBR Generated from u'console_scripts'
+
+import sys
+
+from synergy.service import main
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/packaging/debian/python-synergy-service.synergy.init b/packaging/debian/python-synergy-service.synergy.init
index 4f8e513..8e7d8ec 100644
--- a/packaging/debian/python-synergy-service.synergy.init
+++ b/packaging/debian/python-synergy-service.synergy.init
@@ -19,7 +19,7 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="python-synergy-service"
 NAME=synergy
-DAEMON=/usr/sbin/synergy
+DAEMON=/usr/sbin/synergy-service
 DAEMON_ARGS=""
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
diff --git a/packaging/debian/python-synergy-service.synergy.upstart b/packaging/debian/python-synergy-service.synergy.upstart
index 597ea73..200b57b 100644
--- a/packaging/debian/python-synergy-service.synergy.upstart
+++ b/packaging/debian/python-synergy-service.synergy.upstart
@@ -15,5 +15,5 @@ script
 	DAEMON_ARGS=""
 	exec start-stop-daemon --start --chdir /var/lib/synergy \
 		--chuid synergy:synergy --make-pidfile --pidfile /var/run/synergy/synergy.pid \
-		--exec /usr/bin/synergy -- --config-file=/etc/synergy/synergy.conf ${DAEMON_ARGS}
+		--exec /usr/bin/synergy-service -- --config-file=/etc/synergy/synergy.conf ${DAEMON_ARGS}
 end script
diff --git a/packaging/rpm/python-synergy.spec b/packaging/rpm/python-synergy.spec
index d99856b..2d504e4 100644
--- a/packaging/rpm/python-synergy.spec
+++ b/packaging/rpm/python-synergy.spec
@@ -1,27 +1,27 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
-Name:           python-synergy-service
-Version:        0.2
-Release:        2%{?dist}
-Summary:        Synergy service
+Name:             python-synergy-service
+Version:          0.2
+Release:          2%{?dist}
+Summary:          Synergy service
 
-License:        ASL 2.0
-URL:            https://launchpad.net/synergy-service
-Source0:        https://launchpad.net/synergy-service/%{name}-%{version}.tar.bz2
+License:          ASL 2.0
+URL:              https://launchpad.net/synergy-service
+Source0:          https://launchpad.net/synergy-service/%{name}-%{version}.tar.bz2
 
-BuildArch:      noarch
-BuildRequires:  systemd
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
-Requires(pre):  shadow-utils
-Requires(post): systemd
-Requires(preun): systemd
+BuildArch:        noarch
+BuildRequires:    systemd
+BuildRequires:    python-devel
+BuildRequires:    python-setuptools
+Requires(pre):    shadow-utils
+Requires(post):   systemd
+Requires(preun):  systemd
 Requires(postun): systemd
-Requires:       python-eventlet
-Requires:       python-oslo-config
-Requires:       python-oslo-messaging
-Requires:       python-oslo-log
-Requires:       python-dateutil
+Requires:         python-eventlet
+Requires:         python-oslo-config
+Requires:         python-oslo-messaging
+Requires:         python-oslo-log
+Requires:         python-dateutil
 
 
 %description
@@ -59,6 +59,7 @@ install -d -m0755                           %{buildroot}%{_localstatedir}/lock/s
 %{python_sitelib}/*
 %config(noreplace) %{_sysconfdir}/synergy/synergy.conf
 %{_bindir}/synergy
+%{_bindir}/synergy-service
 %{_unitdir}/synergy.service
 %defattr(-, synergy, root, -)
 %{_localstatedir}/lock/synergy/
diff --git a/scripts/synergy.service b/scripts/synergy.service
index 1942345..ea5516b 100644
--- a/scripts/synergy.service
+++ b/scripts/synergy.service
@@ -6,7 +6,7 @@ After=mysql.service postgresql.service slapd.service rabbitmq-server.service ntp
 User=synergy
 Group=synergy
 WorkingDirectory=/var/lib/synergy
-ExecStart=/usr/bin/synergy
+ExecStart=/usr/bin/synergy-service
 
 [Install]
 WantedBy=multi-user.target
diff --git a/setup.cfg b/setup.cfg
index b920e6f..a14e52f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,6 +22,7 @@ packages =
     synergy
 scripts =
     bin/synergy
+    bin/synergy-service
 
 [entry_points]
 synergy.managers =