diff --git a/synergy-plus/PKGBUILD b/synergy-plus/PKGBUILD
deleted file mode 100644
index 7454e09ba..000000000
--- a/synergy-plus/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Chakra Packages for Chakra, part of chakra-project.org
-#
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
-pkgname=synergy-plus
-pkgver=1.3.4
-pkgrel=2
-pkgdesc="Share your mouse and keyboard between several computers"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/synergy-plus"
-license=('GPL2')
-depends=('libxtst' 'libsm' 'libxinerama')
-source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz"
-        "synergys.rc")
-md5sums=('2c565afe5f920d363eef38dd97449b73'
-         '056e59b1d04a66820ffa4b53e5ec20bc')
-provides=('synergy')
-replaces=('synergy')
-conflicts=('synergy')
-backup=('etc/synergy.conf')
-
-build() {
-    cd ${srcdir}/$pkgname-$pkgver
-
-    ./configure --prefix=/usr --sysconfdir=/etc || return 1
-    make || return 1
-    make DESTDIR=${pkgdir} install || return 1
-
-    install -m755 -d "${pkgdir}/etc"
-    install -m644 examples/synergy.conf "${pkgdir}/etc/" || return 1
-    install -Dm755 ${srcdir}/synergys.rc ${pkgdir}/etc/rc.d/synergy || return 1
-}
diff --git a/synergy-plus/synergys.rc b/synergy-plus/synergys.rc
deleted file mode 100644
index 758ceaf10..000000000
--- a/synergy-plus/synergys.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-daemon_name=synergys
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/synergys`
-case "$1" in
-  start)
-    stat_busy "Starting Synergy Server"
-    [ -z "$PID" ] && /usr/bin/synergys --config /etc/synergy.conf &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Synergy Server"
-    [ ! -z "$PID" ] && kill -9 $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)	
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/synergy/PKGBUILD b/synergy/PKGBUILD
new file mode 100644
index 000000000..e7c98b0c6
--- /dev/null
+++ b/synergy/PKGBUILD
@@ -0,0 +1,54 @@
+#
+# Chakra Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+
+pkgname=synergy
+pkgver=1.4.10
+pkgrel=1
+pkgdesc="Share your mouse and keyboard between several computers"
+url="http://synergy-foss.org"
+arch=('i686' 'x86_64')
+license=('GPL2')
+depends=('gcc-libs' 'libxtst' 'libxinerama' )
+makedepends=('libxt' 'cmake') # used by configure to test for libx11...
+provides=('synergy-plus')
+categories=('utils')
+backup=('etc/synergy.conf')
+source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz"
+        "synergys.socket"
+        "synergys.service")
+sha256sums=('06d5a2ceb4cf8808cdab22441897c7b54ec8b4bc8351ac116f9accf54c720fbe'
+            'aeb357ba161131524aa70a5303a17f78831c9a1ab17dbc7c97e4781a5c4bac44'
+            '846b7200a3bd83f270ca627c2c4601ef6c99bcd4460c514baaacadf0e25746b5')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}-Source"
+
+  cmake -D CMAKE_INSTALL_PREFIX=/usr .
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}-Source/bin"
+  
+  #make DESTDIR="${pkgdir}" install # doesn't work atm
+  
+  # install binary
+  install -d "$pkgdir/usr/bin/"
+  install -Dm755 synergyc "${pkgdir}/usr/bin/"
+  install -Dm755 synergys "${pkgdir}/usr/bin/"
+    
+  # Install systemd service and socket
+  install -d "${pkgdir}/usr/lib/systemd/system"
+  install -Dm644 "${srcdir}/synergys.service" "${pkgdir}/usr/lib/systemd/system/"
+  install -Dm644 "${srcdir}/synergys.socket" "${pkgdir}/usr/lib/systemd/system/"
+  
+  # install config
+  install -m755 -d "${pkgdir}/etc"
+  install -m644 "${srcdir}/${pkgname}-${pkgver}-Source/doc/${pkgname}.conf.example" "${pkgdir}/etc/"
+}
diff --git a/synergy/synergys.service b/synergy/synergys.service
new file mode 100644
index 000000000..56c1ac061
--- /dev/null
+++ b/synergy/synergys.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Synergy Server Daemon
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/synergys --config /etc/synergy.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/synergy/synergys.socket b/synergy/synergys.socket
new file mode 100644
index 000000000..dda1537ca
--- /dev/null
+++ b/synergy/synergys.socket
@@ -0,0 +1,9 @@
+[Unit]
+Conflicts=synergys.service
+
+[Socket]
+ListenStream=24800
+Accept=false
+
+[Install]
+WantedBy=sockets.target