diff --git a/app-laptop/samsung-tools/Manifest b/app-laptop/samsung-tools/Manifest
new file mode 100644
index 00000000..1199f83c
--- /dev/null
+++ b/app-laptop/samsung-tools/Manifest
@@ -0,0 +1,2 @@
+DIST samsung-tools-2.2.tar.gz 421567 SHA256 50e362e0b1f5441768664241485fc95a2493d0222e6a02535eb35a5c21f0f9ab SHA512 679d32c6b71efd5bba5770427a5484a6c4b9e884d2ec26288691cb80e06f9fbcfb25c72fc1f2313e07151ac900437c7e161e4bdddb3cee2c19956baeeaabba8e WHIRLPOOL 0b15f9f45e46ef774168cd2d9309e7adf8e6430bd9427fd7e48277a951af7e6d93bcbe9f69c55e5ef4c40dba8b34bbdb3c4388450b10246f3316fafbbf4d098a
+DIST samsung-tools-2.3.1.tar.gz 425379 SHA256 423ec128d75035b77d9bdeaa3662acbf0e644ae7a6b15671943e7a5764d7b370 SHA512 1234972ceea3925c95d631a2429b9669ba8ece078adb5790784a8ee2f88ec269b5fef98e915604f9c68b404bb37a37a79c8192554c3a5aca97ec654f291d74f1 WHIRLPOOL f7b45eb94406102febd3fcb8079a7a1ebdf31d26d397a900fae20ec052aa262baf20b95deeddba411efd7a17644a889cba06df3e14a909bd5e6fb781e0fc0f2d
diff --git a/app-laptop/samsung-tools/files/samsung-tools.init b/app-laptop/samsung-tools/files/samsung-tools.init
new file mode 100644
index 00000000..ed0f60cb
--- /dev/null
+++ b/app-laptop/samsung-tools/files/samsung-tools.init
@@ -0,0 +1,15 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/samsung-tools/files/samsung-tools.init,v 1.1 2011/11/11 16:05:26 angelos Exp $
+
+depend() {
+	need dbus
+}
+
+start() {
+	ebegin "Setting up samsung-tools"
+	dbus-send --system --print-reply=literal --dest='org.voria.SamsungTools.System' \
+		'/' org.voria.SamsungTools.System.SetInitialDevicesStatus
+	eend $?
+}
diff --git a/app-laptop/samsung-tools/samsung-tools-2.2.ebuild b/app-laptop/samsung-tools/samsung-tools-2.2.ebuild
new file mode 100644
index 00000000..abf3036a
--- /dev/null
+++ b/app-laptop/samsung-tools/samsung-tools-2.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/samsung-tools/samsung-tools-2.1.ebuild,v 1.2 2013/07/02 22:00:21 vincent Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit fdo-mime python-r1
+
+DESCRIPTION="Tools for Samsung laptops"
+HOMEPAGE="http://launchpad.net/samsung-tools"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-laptop/easy-slow-down-manager
+	dev-python/dbus-python
+	dev-python/notify-python
+	dev-python/pygtk
+	net-wireless/rfkill
+	sys-apps/vbetool
+	sys-power/pm-utils
+	x11-misc/xbindkeys"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	return
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-laptop/samsung-tools/samsung-tools-2.3.1.ebuild b/app-laptop/samsung-tools/samsung-tools-2.3.1.ebuild
new file mode 100644
index 00000000..abf3036a
--- /dev/null
+++ b/app-laptop/samsung-tools/samsung-tools-2.3.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/samsung-tools/samsung-tools-2.1.ebuild,v 1.2 2013/07/02 22:00:21 vincent Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit fdo-mime python-r1
+
+DESCRIPTION="Tools for Samsung laptops"
+HOMEPAGE="http://launchpad.net/samsung-tools"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-laptop/easy-slow-down-manager
+	dev-python/dbus-python
+	dev-python/notify-python
+	dev-python/pygtk
+	net-wireless/rfkill
+	sys-apps/vbetool
+	sys-power/pm-utils
+	x11-misc/xbindkeys"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	return
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}