diff --git a/net-misc/teamviewer/files/teamviewer.service b/net-misc/teamviewer/files/teamviewer.service
new file mode 100644
index 0000000..87cc363
--- /dev/null
+++ b/net-misc/teamviewer/files/teamviewer.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Daemon for TeamViewer-8
+
+[Service]
+ExecStart=/opt/teamviewer-8/teamviewerd -f
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/net-misc/teamviewer/teamviewer-7.0.9377.ebuild b/net-misc/teamviewer/teamviewer-7.0.9377.ebuild
index 1929d74..48c1edb 100644
--- a/net-misc/teamviewer/teamviewer-7.0.9377.ebuild
+++ b/net-misc/teamviewer/teamviewer-7.0.9377.ebuild
@@ -84,7 +84,7 @@ src_install () {
 
 	newicon -s 48 "${S}"/.tvscript/${PN}.png ${MY_PN}.png
 	dodoc linux_FAQ_{EN,DE}.txt
-	make_desktop_entry ${MY_PN} TeamViewer ${MY_PN}
+	make_desktop_entry ${MY_PN} TeamViewer-${MV} ${MY_PN}
 }
 
 pkg_preinst() {
diff --git a/net-misc/teamviewer/teamviewer-8.0.17147.ebuild b/net-misc/teamviewer/teamviewer-8.0.17147.ebuild
index 2aed6fe..2837acc 100644
--- a/net-misc/teamviewer/teamviewer-8.0.17147.ebuild
+++ b/net-misc/teamviewer/teamviewer-8.0.17147.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit eutils gnome2-utils
+inherit eutils gnome2-utils systemd
 
 # Major version
 MV=${PV/\.*}
@@ -101,7 +101,8 @@ src_install () {
 
 	newicon -s 48 desktop/${PN}.png ${MY_PN}.png
 	dodoc ../linux_FAQ_{EN,DE}.txt
-	make_desktop_entry ${MY_PN} TeamViewer ${MY_PN}
+	make_desktop_entry ${MY_PN} TeamViewer-${MV} ${MY_PN}
+	systemd_dounit ${FILESDIR}/${PN}.service
 }
 
 pkg_preinst() {