diff --git a/app-emulation/open-vm-tools/ChangeLog b/app-emulation/open-vm-tools/ChangeLog
index fd00fe3..00a51b5 100644
--- a/app-emulation/open-vm-tools/ChangeLog
+++ b/app-emulation/open-vm-tools/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*open-vm-tools-0.0.2009.06.18_p172495 (08 Jul 2009)
+
+  08 Jul 2009; Mario Fetka <mario.fetka@gmail.com>
+  +open-vm-tools-0.0.2009.06.18_p172495.ebuild:
+  Bump
+
 *open-vm-tools-0.0.2009.05.22_p167859 (12 Jun 2009)
 
   12 Jun 2009; Mario Fetka <mario.fetka@gmail.com>
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index 53342cf..079bb42 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -6,6 +6,8 @@ AUX open-vm.confd 88 RMD160 5e398024e72a871f258d73e09f02e37a815443b0 SHA1 56133c
 AUX open-vm.initd 1875 RMD160 9d2cc36fd93e70ae20eecd49b10c4da0e09aad69 SHA1 1702f267d32ca138e0e99d9ed86b4abc32cc3997 SHA256 1799b78836441b389de0b3d92aad80fcf020fe8b57da4f6d6999f86ee87f51bf
 AUX wiper-warning-fix.patch 418 RMD160 d3595ca361e1b330e22ec10b33b19813df94ff82 SHA1 ff644d5fa4e5d4e5017ce843cd09ab282e4dcd9a SHA256 3678c0ab683336e645a0c2e1c2167ad6fd094784722b63c6e66c435d685ed712
 DIST open-vm-tools-2009.05.22-167859.tar.gz 3417843 RMD160 c8403e0fe1ff32ec356ce997b7e621ee7fe87d22 SHA1 a38e16e8cc6bb3b9d9ce88244aef8332a233b7e4 SHA256 99f3726f86e53abac4efcf70a871e2003d2f245fd83b663ae8ad756322c48a2b
+DIST open-vm-tools-2009.06.18-172495.tar.gz 3424675 RMD160 7fceacdc3e2e1857a85fd348625ed906383bb52f SHA1 3f2273e2366dc8bca60a3f84e0933580aa4c066d SHA256 27d529553c9a62172876a9a88289102d77bc6307b6fc10b7a2bc17cbbb54251e
 EBUILD open-vm-tools-0.0.2009.05.22_p167859.ebuild 2330 RMD160 95591bd7ed4bb5ba9d07fb725d6deceea0c538cd SHA1 3d9fe2096ecf7ae8d2c3148d83b0f656960283f2 SHA256 a3a43bc3d8e93245db6ab7f01e572d2fdf0c898f78b5d284b64ec9a35ac2f7f4
-MISC ChangeLog 1395 RMD160 5483cfc6199bbe2ab0e552df611a46f47f19c73f SHA1 ff1447558a8b5aae79cb4c1bbd1048f899b587f5 SHA256 d49e46856fc6ad813188c45b2301b83be02e3f950085babf17a4adb41ad7d2f9
+EBUILD open-vm-tools-0.0.2009.06.18_p172495.ebuild 2330 RMD160 95591bd7ed4bb5ba9d07fb725d6deceea0c538cd SHA1 3d9fe2096ecf7ae8d2c3148d83b0f656960283f2 SHA256 a3a43bc3d8e93245db6ab7f01e572d2fdf0c898f78b5d284b64ec9a35ac2f7f4
+MISC ChangeLog 1555 RMD160 6b6074be8036a2b54a1077483c6642564ceddbaf SHA1 e1f15ef774751a396c3f309a1c162d722e5de021 SHA256 52a04ba1aa1769fbf20fd70abb621548b1925fe6b8b16d30681f6e64f6ea08eb
 MISC metadata.xml 273 RMD160 868f3e6ce2b19d6874be333eb73f9320df75605f SHA1 a5fa804bbe72aee73c241218da87736c81ff3815 SHA256 3528eb8ce4ae248c296a08cd9c3d252fbb4421fe5369ec3b5353b3c4f0da025d
diff --git a/app-emulation/open-vm-tools/open-vm-tools-0.0.2009.06.18_p172495.ebuild b/app-emulation/open-vm-tools/open-vm-tools-0.0.2009.06.18_p172495.ebuild
new file mode 100644
index 0000000..eef05be
--- /dev/null
+++ b/app-emulation/open-vm-tools/open-vm-tools-0.0.2009.06.18_p172495.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit pam eutils autotools
+
+MY_PP="${P/0.0./}"
+MY_P="${MY_PP/_p/-}"
+VMWARE_GROUP="vmware"
+
+DESCRIPTION="Opensourced tools for VMware guests"
+HOMEPAGE="http://open-vm-tools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="X xinerama icu unity gtkmm"
+DEPEND="virtual/linux-sources
+		sys-apps/ethtool
+		X? (
+			x11-libs/libX11
+			x11-libs/gtk+
+			)
+		unity? (
+			x11-libs/libXScrnSaver
+			dev-libs/uriparser
+		)
+		xinerama? (
+			x11-libs/libXinerama
+			)
+		gtkmm? (
+			dev-cpp/gtkmm
+		)
+		!app-emulation/vmware-workstation-tools
+		!app-emulation/vmware-server-tools
+		!app-emulation/vmware-esx-tools
+		sys-process/procps
+		dev-libs/libdnet
+		icu? ( dev-libs/icu )
+		"
+
+RDEPEND="${DEPEND/virtual\/linux\-sources/}
+		virtual/pam
+		X? (
+			x11-base/xorg-server
+			x11-drivers/xf86-video-vmware
+			x11-drivers/xf86-input-vmmouse
+		)
+		unity? (
+			x11-libs/libXScrnSaver
+			dev-libs/uriparser
+		app-emulation/open-vm-modules )
+		"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use unity && ! use xinerama && \
+	  die 'The Unity USE flag requires USE="xinerama" as well'
+
+	enewgroup ${VMWARE_GROUP}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/default-scripts.patch"
+	epatch "${FILESDIR}/wiper-warning-fix.patch"
+	epatch "${FILESDIR}/open-vm-tools-build-fix.patch"
+	epatch "${FILESDIR}/open-vm-tools-2009.05.22-167859-libproc-1.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+	--without-kernel-modules \
+	$(use_with icu) \
+	$(use_with X x) \
+	$(use_with gtkmm) \
+	$(use_enable unity) \
+	$(use_enable xinerama multimon) \
+	|| die "Error: econf failed!"
+}
+
+src_install() {
+	pamd_mimic_system vmware-guestd auth account
+
+	emake install DESTDIR="${D}" || die "Failed to install"
+
+	newinitd "${FILESDIR}/open-vm.initd" vmware-tools
+	newconfd "${FILESDIR}/open-vm.confd" vmware-tools
+
+	if use X;
+	then
+		insinto /etc/xdg/autostart
+		doins "${FILESDIR}/open-vm-tools.desktop"
+
+		elog "To be able to use the drag'n'drop feature of VMware for file"
+		elog "exchange, you need to do this:"
+		elog "	Add 'vmware-tools' to your default runlevel"
+		elog "	Add the users which should have access to this function"
+		elog "	to the group 'vmware'"
+	fi
+}