diff --git a/app-emulation/vmware-server-console/ChangeLog b/app-emulation/vmware-server-console/ChangeLog
new file mode 100644
index 00000000..cabdc4b5
--- /dev/null
+++ b/app-emulation/vmware-server-console/ChangeLog
@@ -0,0 +1,16 @@
+# ChangeLog for app-emulation/vmware-server-console
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*vmware-server-console-1.0.9_p156507 (30 May 2009)
+
+  30 May 2009; Mario Fetka <mario.fetka@gmail.com>
+  +files/90vmware-server-console,
+  +vmware-server-console-1.0.9_p156507.ebuild,
+  +files/vmware-server-console.xml, +metadata.xml:
+  initial checkin based on new eclass
+
+  15 Jan 2009; Mike Auty <ikelos@gentoo.org>
+  vmware-server-console-1.0.8.126538.ebuild:
+  Stabilize vmware-server-console to match the main tree.
+
diff --git a/app-emulation/vmware-server-console/Manifest b/app-emulation/vmware-server-console/Manifest
new file mode 100644
index 00000000..cf43f95f
--- /dev/null
+++ b/app-emulation/vmware-server-console/Manifest
@@ -0,0 +1,6 @@
+AUX 90vmware-server-console 76 RMD160 22fed127d20bfb758163443dcbd2879bf1d49be6 SHA1 105e3194c134b752a8d5cef1a23ae621cd835d80 SHA256 ff3abe9d58fd673d8f3d2f7e967aa6db426e3e15b4d868dc1483682357a928b8
+AUX vmware-server-console.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
+DIST VMware-server-linux-client-1.0.9-156507.zip 23772932 RMD160 e96e94e4173f4e5fa05ff74ab5637472e1398d4a SHA1 4aa99c8f72f13f1cbbfa21bf35014c386b1156c4 SHA256 c0735562ab900f02ff954b7f907fd0e57f25c3073ec932f0a684460c8ea4b3e7
+EBUILD vmware-server-console-1.0.9_p156507.ebuild 1904 RMD160 9ef4b55ad5a7e559935c4037ffc99ed9d12b4823 SHA1 965198f8ffcf45e87d65896d0f30bf770a70dfd6 SHA256 96fa0636f31020fd1e76234bf0ac16f2da5053edd59822a0e2ef05c46a561911
+MISC ChangeLog 559 RMD160 84901a64678ba0fddf2c1d8c1e03aaf76038d324 SHA1 dd11158de6d42d77554adbc686d8bb41a9157852 SHA256 cb8d6b1d70f12ac92b51ca8ce49c3f771e64dde58987c9d3477220cf51578763
+MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
diff --git a/app-emulation/vmware-server-console/files/90vmware-server-console b/app-emulation/vmware-server-console/files/90vmware-server-console
new file mode 100644
index 00000000..847dd8c9
--- /dev/null
+++ b/app-emulation/vmware-server-console/files/90vmware-server-console
@@ -0,0 +1,2 @@
+PATH=/opt/vmware/server/console/bin
+ROOTPATH=/opt/vmware/server/console/bin
diff --git a/app-emulation/vmware-server-console/files/vmware-server-console.xml b/app-emulation/vmware-server-console/files/vmware-server-console.xml
new file mode 100644
index 00000000..8d5e2eff
--- /dev/null
+++ b/app-emulation/vmware-server-console/files/vmware-server-console.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+ <mime-type type="application/x-vmware-vm">
+  <comment xml:lang="en">VMware virtual machine</comment>
+  <magic priority="50">
+   <match type="string" value='config.version = "' offset="0:4096"/>
+  </magic>
+  <glob pattern="*.vmx"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-vmdisk">
+  <comment xml:lang="en">VMware virtual disk</comment>
+  <magic priority="50">
+   <match type="string" value="# Disk DescriptorFile" offset="0"/>
+   <match type="string" value="KDMV" offset="0"/>
+  </magic>
+  <glob pattern="*.vmdk"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-team">
+  <comment xml:lang="en">VMware team</comment>
+  <magic priority="50">
+   <match type="string" value='&lt;Foundry version="1"&gt;' offset="0">
+    <match type="string" value="&lt;VMTeam&gt;" offset="23:24"/>
+   </match>
+  </magic>
+  <glob pattern="*.vmtm"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-snapshot">
+  <comment xml:lang="en">VMware virtual machine snapshot</comment>
+  <magic priority="50">
+   <match type="string" value="\\0xD0\\0xBE\\0xD0\\0xBE" offset="0"/>
+  </magic>
+  <glob pattern="*.vmsn"/>
+ </mime-type>
+
+ <mime-type type="application/x-vmware-vmfoundry">
+  <comment xml:lang="en">VMware virtual machine foundry</comment>
+  <magic priority="50">
+   <match type="string" value='&lt;Foundry version="1"&gt;' offset="0">
+    <match type="string" value="&lt;VM&gt;" offset="23:24"/>
+   </match>
+  </magic>
+  <glob pattern="*.vmxf"/>
+ </mime-type>
+</mime-info>
diff --git a/app-emulation/vmware-server-console/metadata.xml b/app-emulation/vmware-server-console/metadata.xml
new file mode 100644
index 00000000..3260ec55
--- /dev/null
+++ b/app-emulation/vmware-server-console/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>vmware</herd>
+</pkgmetadata>
diff --git a/app-emulation/vmware-server-console/vmware-server-console-1.0.9_p156507.ebuild b/app-emulation/vmware-server-console/vmware-server-console-1.0.9_p156507.ebuild
new file mode 100644
index 00000000..d7282491
--- /dev/null
+++ b/app-emulation/vmware-server-console/vmware-server-console-1.0.9_p156507.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server-console/vmware-server-console-1.0.5.80187.ebuild,v 1.4 2008/04/26 15:40:42 ikelos Exp $
+
+EAPI="2"
+
+# Unlike many other binary packages the user doesn't need to agree to a licence
+# to download VMWare. The agreeing to a licence is part of the configure step
+# which the user must run manually.
+
+VM_SRC="VMware-server-linux-client-${PV/_p/-}.zip"
+
+inherit eutils vmware-1
+
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+
+DEPEND=">=sys-libs/glibc-2.3.5
+	virtual/os-headers
+	>=dev-lang/perl-5
+	>=sys-apps/portage-2.0.54
+	app-arch/unzip"
+
+# vmware-server-console should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND=">=sys-libs/glibc-2.3.5
+	amd64? ( app-emulation/emul-linux-x86-gtklibs )
+	x86? ( x11-libs/libSM
+		x11-libs/libICE
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXcursor
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXft
+		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXtst )
+	>=dev-lang/perl-5
+	!<sys-apps/dbus-0.62"
+
+S="${WORKDIR}/${PN}-distrib"
+
+etcdir="/etc/${PN}"
+
+pkg_setup() {
+	vmware-1_pkg_setup
+	enewgroup "${VMWARE_GROUP}"
+}
+
+src_unpack() {
+	vmware-1_src_unpack
+	cd "${WORKDIR}"
+	unpack ./${PN/vm/VM}-${PV/_p/-}.tar.gz
+}
+
+src_install() {
+	echo 'libdir = "'${VMWARE_INSTALL_DIR}'/lib"' > etc/config
+	vmware-1_src_install
+
+	# Fix an ugly GCC error on start
+	rm -f "${D}${VMWARE_INSTALL_DIR}/lib/lib/libgcc_s.so.1/libgcc_s.so.1"
+	make_desktop_entry ${PN} "VMWare Remote Console" ${PN}.png System
+
+	dodir /usr/bin
+	dosym ${VMWARE_INSTALL_DIR}/bin/${PN} /usr/bin/${PN}
+}
+
+pkg_config() {
+	einfo "Running ${ROOT}${dir}/bin/vmware-config-server-console.pl"
+	"${ROOT}${dir}/bin/vmware-config-server-console.pl"
+}