diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
new file mode 100644
index 0000000000000000000000000000000000000000..4e794f56f1a22fa47e880dbae54d5d38deb11460
--- /dev/null
+++ b/net-misc/teamviewer/Manifest
@@ -0,0 +1,5 @@
+AUX teamviewer.sh 659 SHA256 3f30bfda8900af2fa5e2e7fd887ce9b18e7d1fba8110d3f4b086a19c1ba4d41c SHA512 9005cd5c10ecdafd60cebe3e3f188ff62329ebfa746278b139a589c8ad37c4d5ea60d61fafe713fbb35f79b3162073fae71246b21b62d4517df7af3d169d7dd6 WHIRLPOOL 7cd2552520ae137861c3936eb996b23839fd97303c2bb5563672414da7d5848fde38e03068417a9bd3fa4e1f0438513a3902d683b95d464b520852633d2ac9a2
+AUX teamviewerd.conf 230 SHA256 5cd8485974ef1c62be8fbe4d92f31a03b616e1a3e46c11bcadef7bdb2c169d8a SHA512 31d412278f61fc943f474a02db6de802f53da8b2b424adb5c8a1720bff4316ccb36d5bfbb505c056ef031dcfd52fef5ea28da96b348a76ddf9c624ca1c3cf78f WHIRLPOOL f2bb0f80d15b3dce8db6d9e598e2e050c09aa64e255edfd43567245b7f208aed725e384bcb27b120d3e81655d25e13472ed39e4daefd3bc7d855d9a0bcd3d5c6
+AUX teamviewerd.init 900 SHA256 200ad1345d137377010e4cbb55f3d82ff8f245e86c33a8cff6639afcdf75103d SHA512 1a29a5594e5cc7821a3d0a02847e7954bf79b3c9f020af3e69ce58eb1366041e1c7de8a44361ae1b3e3bc0fef9e70d230e313df3ca536bca65446f605ff4c172 WHIRLPOOL 89a5e7b35e99dcd9af6c1a6357e276cd465eeca4fc998f3195bdd23a837c02bbd42084ff12bc33e35b2ec1f3697dd39274c1a2ed755dddf63222d0d288fd41ee
+DIST teamviewer_10.0.37742_i386.deb 40663492 SHA256 ad40024f9f941f33de8a3028eb1c2975be00416b8e1a61c722e1ebd4acff4f72 SHA512 6ae098e728323dbcfe17a70b8014e17090a22312c6d19fe40e5ad0dcf0ca98cd8d7809b96cbf75c0e2aa2a40a6ced88f24a44a5c095fd3ebc03bbf803a8682fd WHIRLPOOL 5164ce88794f5fbb89a5bf0b3ec867eca10632a945fc12097c8fff07285fd6ccbccd0ac579b2cfadb83f751c2106f2046ae9a8d8a3f01a905ab4ec19b1c15751
+EBUILD teamviewer-10.0.37742-r4.ebuild 2684 SHA256 57478650754089e95cd9eb55d8643d2512ef13e94e60368c7cf3eaab9d2bcf4e SHA512 1236f015b43657b4dc5c5994f14ff55ca40aa9b7347ecfb06d63db5833b76995e39a59dd0c6add5f607dcb61a30c538c1e29df7e3e1db411fa528a8f6a579f9a WHIRLPOOL 77d045f9620a2dd89571c3de997715d9ec6b5de0ef1a121a7d327b005afbd6bc77f638fc816cfd4e195d67cceb0aa7588c88246be6cc31ade467906a18ecce34
diff --git a/net-misc/teamviewer/files/teamviewer.sh b/net-misc/teamviewer/files/teamviewer.sh
new file mode 100644
index 0000000000000000000000000000000000000000..437899c56b9a9c8f3f167a95e65d3038a4135204
--- /dev/null
+++ b/net-misc/teamviewer/files/teamviewer.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+tv="$(basename $0)"
+prefix="${HOME}/.wine-${tv}"
+arch="win32"
+
+if [[ ! -d "${prefix}" ]]; then
+	echo "Creating prefix..."
+	env WINEARCH="${arch}" WINEPREFIX="${prefix}" wineboot -i &> /dev/null
+	echo "Copying TeamViewer files to prefix..."
+	cp -R "/opt/${tv}/wine/drive_c/TeamViewer" "${prefix}/drive_c/TeamViewer"
+	echo "Creating config and log directories in ~/.config/teamviewer10"
+	mkdir -p "${HOME}"/.config/teamviewer10/{config,logfiles}
+fi
+
+env WINEDLLPATH="${prefix}/drive_c/TeamViewer" WINEPREFIX="${prefix}" wine "C:\\TeamViewer\\TeamViewer.exe" "\${[@]}" &> "${HOME}/.config/teamviewer10/logfiles/-$(date +%Y.%m.%d-%H:%M:%S)-wine.log"
diff --git a/net-misc/teamviewer/files/teamviewerd.conf b/net-misc/teamviewer/files/teamviewerd.conf
new file mode 100644
index 0000000000000000000000000000000000000000..e949660678be50e264786aac285c0bad9a870ac8
--- /dev/null
+++ b/net-misc/teamviewer/files/teamviewerd.conf
@@ -0,0 +1,6 @@
+# This entry can be used to specify a default daemon password.
+# It is set by running /etc/init.d/teamviewerd@TVV@ passwd.
+# The password must be between 8 and 12 characters, and special characters should
+# be avoided.
+
+PASSWD=""
diff --git a/net-misc/teamviewer/files/teamviewerd.init b/net-misc/teamviewer/files/teamviewerd.init
new file mode 100644
index 0000000000000000000000000000000000000000..00c3cf6b323d67e7b59408da743bc0a93678ba6c
--- /dev/null
+++ b/net-misc/teamviewer/files/teamviewerd.init
@@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/files/teamviewerd.init,v 1.2 2013/04/18 13:08:45 hasufell Exp $
+
+command=/opt/teamviewer@TVV@/tv_bin/teamviewerd
+command_args=-d
+description="daemon for TeamViewer"
+pidfile=/var/run/teamviewerd.pid
+
+extra_stopped_ommands="passwd"
+
+passwd() {
+	if [ -z "${PASSWD}" ]; then
+		eerror "No password specified."
+		exit 1
+	fi
+
+	ebegin "Attempting to change password."
+	/opt/teamviewer10/tv_bin/teamviewerd --passwd "${PASSWD}"
+	retr=$?
+	case $retr in
+		0)	einfo "Password successfully set." ;;
+		11|12)	eerror "Password must be between 8 and 12 characters.";;
+		13)	eerror "Invalid characters detected.";;
+		14)	eerror "Password invalid. Validation failed.";;
+		*)	eerror "Unknown error code";;
+	esac
+	eend $retr
+	exit $retr
+}
diff --git a/net-misc/teamviewer/teamviewer-10.0.37742-r4.ebuild b/net-misc/teamviewer/teamviewer-10.0.37742-r4.ebuild
new file mode 100644
index 0000000000000000000000000000000000000000..b736975c9f983bdc89ce9b34fbb5230de7033575
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-10.0.37742-r4.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils gnome2-utils systemd unpacker
+
+# Major version
+MV=${PV/\.*}
+MY_PN=${PN}${MV}
+DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
+HOMEPAGE="https://www.teamviewer.com"
+SRC_URI="https://download.teamviewer.com/download/version_${MV}x/${PN}_${PV}_i386.deb"
+
+LICENSE="TeamViewer"
+SLOT=${MV}
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	app-emulation/wine[abi_x86_32(-)]
+	dev-qt/qtcore:4[abi_x86_32(-)]
+	dev-qt/qtgui:4[abi_x86_32(-)]
+	dev-qt/qtwebkit:4[abi_x86_32(-)]
+	media-libs/alsa-lib[abi_x86_32(-)]
+	x11-libs/libICE[abi_x86_32(-)]
+	x11-libs/libSM[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXdamage[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXfixes[abi_x86_32(-)]
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXtst[abi_x86_32(-)]"
+
+QA_PREBUILT="opt/teamviewer${MV}/*"
+
+S=${WORKDIR}/opt/teamviewer/tv_bin
+
+src_prepare() {
+	sed \
+		-e "s/@TVV@/${MV}/g" \
+		"${FILESDIR}"/${PN}d.init > "${T}"/init || die
+	sed \
+		-e "s/@TVV@/${MV}/g" \
+		"${FILESDIR}"/${PN}d.conf > "${T}"/conf || die
+}
+
+src_install () {
+	local destdir="/opt/${MY_PN}"
+
+	# install wine prefix skeleton and reg keys
+	insinto "${destdir}/wine/drive_c/"
+	doins -r wine/drive_c/TeamViewer/
+	# fix permissions
+	fperms 755 ${destdir}/wine/drive_c/TeamViewer/TeamViewer.exe
+
+	# install wine wrapper
+	exeinto "/opt/bin"
+	newexe "${FILESDIR}/${PN}.sh" "${MY_PN}"
+
+	# install teamviewer linux binaries
+	exeinto "${destdir}/tv_bin"
+	doexe TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32
+	use amd64 && doexe TVGuiSlave.64
+
+	# install daemon binary and scripts
+	exeinto "${destdir}/tv_bin"
+	doexe ${PN}d
+	newinitd "${T}"/init ${PN}d${MV}
+	newconfd "${T}"/conf ${PN}d${MV}
+	systemd_newunit script/${PN}d.service ${PN}d${MV}.service
+
+	# set up logdir
+	keepdir /var/log/${MY_PN}
+	dosym /var/log/${MY_PN} /opt/${MY_PN}/logfiles
+
+	# set up config dir
+	keepdir /etc/${MY_PN}
+	dosym /etc/${MY_PN} /opt/${MY_PN}/config
+
+	newicon -s 48 desktop/${PN}.png ${MY_PN}.png
+	#dodoc ../doc/linux_FAQ_{EN,DE}.txt
+	make_desktop_entry ${MY_PN} "TeamViewer ${MV}" ${MY_PN}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	ewarn "STARTUP NOTICE:"
+	elog "You cannot start the daemon via \"teamviewer --daemon start\"."
+	elog "Instead use the provided gentoo initscript:"
+	elog "  /etc/init.d/${PN}d${MV} start"
+	elog
+	elog "Logs are written to \"/var/log/teamviewer${MV}\""
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}