diff --git a/srcpkgs/synergy/files/synergy.desktop b/srcpkgs/synergy/files/synergy.desktop
new file mode 100644
index 00000000000..e7bf87b9ee0
--- /dev/null
+++ b/srcpkgs/synergy/files/synergy.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Synergy
+Comment=The Synergy GUI is based on QSynergy by Volker Lanz.
+Exec=synergy
+Icon=synergy
+Terminal=false
+Type=Application
+Categories=Utility;DesktopUtility;Qt
diff --git a/srcpkgs/synergy/files/synergy.png b/srcpkgs/synergy/files/synergy.png
new file mode 100644
index 00000000000..5534f0fdf52
Binary files /dev/null and b/srcpkgs/synergy/files/synergy.png differ
diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index 0adfd6bf665..66c64dce010 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,16 +1,16 @@
 # Template file for 'sed'
 pkgname=synergy
-version=1.4.10
+version=1.4.12
 revision=1
 wrksrc=${pkgname}-${version}-Source
-makedepends="cmake libSM-devel libICE-devel libXext-devel
- libXtst-devel>=1.2.1_2 libXinerama-devel"
+hostmakedepends="cmake unzip"
+makedepends="qt-devel libSM-devel libXext-devel libXtst-devel>=1.2.1_2 libXinerama-devel"
 short_desc="Share a single mouse and keyboard between multiple computers"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://synergy-foss.org/"
 license="GPL-2"
 distfiles="http://synergy.googlecode.com/files/$pkgname-$version-Source.tar.gz"
-checksum=06d5a2ceb4cf8808cdab22441897c7b54ec8b4bc8351ac116f9accf54c720fbe
+checksum=35b60c8d73368a0cb90daa629e64f66171b934a799a82427431979cca7260849
 long_desc="
  Synergy is Free and Open Source Software that lets you easily share your
  mouse and keyboard between multiple computers, where each computer has its
@@ -20,22 +20,36 @@ long_desc="
  screen. Synergy is released under the GNU Public License (GPL)."
 
 do_build() {
+	unset LDFLAGS
+
+	# Unzip the crypto library
+	unzip -d tools/cryptopp562 tools/cryptopp562.zip
+
 	cmake  -DCMAKE_INSTALL_PREFIX=/usr .
 	make ${makejobs}
+
+	# qt4 gui
+	cd src/gui
+	qmake
+	make ${makejobs}
 }
 
 do_install() {
+	vinstall bin/synergy 755 usr/bin
 	vinstall bin/synergyc 755 usr/bin
 	vinstall bin/synergys 755 usr/bin
+
 	vmkdir usr/share/examples/${pkgname}
 	install -m644 doc/synergy.conf.example* \
 		${DESTDIR}/usr/share/examples/${pkgname}
+
+	vinstall ${FILESDIR}/synergy.png 644 usr/share/pixmaps
+	vinstall ${FILESDIR}/synergy.desktop 644 usr/share/applications
 }
 
 synergy_package() {
-	conf_files="/etc/synergy.conf"
+	depends="desktop-file-utils"
 	pkg_install() {
-		vmove etc
-		vmove usr
+		vmove all
 	}
 }