diff --git a/app-emulation/vmware-server/ChangeLog b/app-emulation/vmware-server/ChangeLog
index d2c17e9..953de29 100644
--- a/app-emulation/vmware-server/ChangeLog
+++ b/app-emulation/vmware-server/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/ChangeLog,v 1.61 2009/12/18 16:14:42 vadimk Exp $
 
+*vmware-server-2.0.2.203138-r2 (05 Dec 2010)
+
+  05 Dec 2010; Mario Fetka <mario.fetka@gmail.com>
+  +vmware-server-2.0.2.203138-r2.ebuild, files/vmware-server-2.rc:
+  bump release to be greater then in portage
+
   19 Aug 2010; Mario Fetka <mario.fetka@gmail.com>
   +vmware-server-1.0.10.203137-r1.ebuild:
   add proprt lsmod path
diff --git a/app-emulation/vmware-server/Manifest b/app-emulation/vmware-server/Manifest
index 64a81e4..f3b1e7a 100644
--- a/app-emulation/vmware-server/Manifest
+++ b/app-emulation/vmware-server/Manifest
@@ -17,7 +17,7 @@ AUX general/007_all_use-modprobe-over-insmod.patch 445 RMD160 186ab443a733276a70
 AUX general/008_all_dhcpd-conf-location.patch 382 RMD160 6b0c1a3571fb0d7bc537930d9a77fb4d960aa104 SHA1 344da932ea8652d85028d4f17a3a66afd90c01b7 SHA256 577454af27bc9107220055f9d8b93b40e31650c205d31d5a351c5a1ecc16d658
 AUX general/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498
 AUX vmware-authd 211 RMD160 1bd60030f6f7bb78c0fd3b6d156498121d4be5d4 SHA1 514538222dc4e665e1d450e1bf9bf1d8e03a2b61 SHA256 3eafe9ac10aeac852faa1fbbccb5c525560e358f69964995c5cfb86c53af6b54
-AUX vmware-server-2.rc 1561 RMD160 ea122e81095807e635626a9a8ff1e445137da2b0 SHA1 50262ff622afe0a8d8eab3ad2599193cd56ad211 SHA256 e4cc1591c0cd8ab6e699d4e346ea69e0a0f4d564bc34ae216027338f74517afd
+AUX vmware-server-2.rc 1563 RMD160 dc3b5e2e2e6b89486d093f0f5a2b479d8b6525c9 SHA1 aeb3b2b3de89d5a80e8e7b9ec02d2c77c8dd3f2d SHA256 3c9ecd51bc8db1d636bea3db295d62cfe28941a9ffe2c971a2ac96481c698bad
 AUX vmware-server.rc 1529 RMD160 d6840024f8c7be0a673e5e29660cc75fea9520d8 SHA1 049cf33eb5bac09415f8e2a85f7ecfd0bbc5ab4a SHA256 ef551e4240eea88184c96e286354a53a4983ce80c3332a127767301b42586cb2
 AUX vmware-server.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
 DIST VMware-server-1.0.10-203137.tar.gz 107183610 RMD160 0ddaa6a6f5b3c08804eb1b97f13ffd0fc0b87876 SHA1 f21ed65a500b2176166d90ed2821892ce1cb1fd5 SHA256 744d6057daeea5f9a950d164a3d9c5ca6273feed645699cfcf16d8acbcfa504c
@@ -31,6 +31,7 @@ EBUILD vmware-server-1.0.10.203137.ebuild 3235 RMD160 b0109235281ca0cec263caf02a
 EBUILD vmware-server-1.0.8.126538.ebuild 2988 RMD160 f2357cd81b4dec02049a61e6819bdc42bbaf62fb SHA1 f8cf7a291f1832a0f51153318ce99b5c4d57f643 SHA256 ef04d90fb43477e7d6e8bb0f1820d3ff61dcc93c47e2681ffc847b5138ae4ddf
 EBUILD vmware-server-1.0.9.156507.ebuild 2988 RMD160 94ae0854fc4c33eb36180c457a2f6d237c1be541 SHA1 12248abfb16a02a7a1edc28b196f18555df46383 SHA256 238560397076cd27bafbf15ca7370724fbe5c0fdb944d1a79acb7675cc79cc5a
 EBUILD vmware-server-2.0.2.203138-r1.ebuild 10059 RMD160 799135f4f398f8326cc2b73d2dd87408ff91c0a7 SHA1 34f9f0731b932a485b8fa5b78e8445b8ae96a86f SHA256 eee06445795d9bc322ecd079ea9850e572445d2823b5a47a8fefbf532391ed85
+EBUILD vmware-server-2.0.2.203138-r2.ebuild 10059 RMD160 799135f4f398f8326cc2b73d2dd87408ff91c0a7 SHA1 34f9f0731b932a485b8fa5b78e8445b8ae96a86f SHA256 eee06445795d9bc322ecd079ea9850e572445d2823b5a47a8fefbf532391ed85
 EBUILD vmware-server-2.0.2.203138.ebuild 10059 RMD160 799135f4f398f8326cc2b73d2dd87408ff91c0a7 SHA1 34f9f0731b932a485b8fa5b78e8445b8ae96a86f SHA256 eee06445795d9bc322ecd079ea9850e572445d2823b5a47a8fefbf532391ed85
-MISC ChangeLog 14734 RMD160 6bb7528e9416029667c527468e91ad10ac91171d SHA1 75df0f921ae9388fda353518d088f81a2ad2af55 SHA256 b3bae5496387e14acf3acbca5a0fa5e921a8143219a315356bef6768d25b241c
+MISC ChangeLog 14944 RMD160 b4616754c699293aa8a0184de6409edb3744b77d SHA1 7191b61ed029cb02357563ff0dd297141a609177 SHA256 be33a82c22676b822f2776f49f9c19d78ace036a56ce5976694b0fe15f2df0a1
 MISC metadata.xml 451 RMD160 34ad07edf6d4f6d9b00b8c0ea197fa8ddad2397b SHA1 7983215b3da6bbfb2e5c167b33b0625a5a31280d SHA256 b64b12ed17797856c0f950540b92f134ca8ffafd40eabafb4ef90c889e16a3e3
diff --git a/app-emulation/vmware-server/files/vmware-server-2.rc b/app-emulation/vmware-server/files/vmware-server-2.rc
index b8e09f1..39c31a4 100755
--- a/app-emulation/vmware-server/files/vmware-server-2.rc
+++ b/app-emulation/vmware-server/files/vmware-server-2.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/files/vmware-server.rc,v 1.6 2007/09/20 17:13:13 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/files/vmware-server-2.rc,v 1.1 2009/05/09 21:55:17 ikelos Exp $
 
 depend() {
 	need localmount hald
diff --git a/app-emulation/vmware-server/vmware-server-2.0.2.203138-r2.ebuild b/app-emulation/vmware-server/vmware-server-2.0.2.203138-r2.ebuild
new file mode 100644
index 0000000..a51af1e
--- /dev/null
+++ b/app-emulation/vmware-server/vmware-server-2.0.2.203138-r2.ebuild
@@ -0,0 +1,320 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/vmware-server-2.0.2.203138-r1.ebuild,v 1.4 2010/05/13 22:33:47 vadimk Exp $
+
+# 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.
+
+EAPI="2"
+
+inherit eutils pam pax-utils versionator
+
+MY_PV=$(replace_version_separator 3 '-' )
+MY_PN="VMware-server-${MY_PV}"
+
+DESCRIPTION="VMware Server for Linux"
+HOMEPAGE="http://www.vmware.com/"
+DOWNLOAD_URL="http://downloads.vmware.com/d/info/datacenter_downloads/vmware_server/2_0"
+SRC_URI=" x86? ( mirror://vmware/software/vmserver/${MY_PN}.i386.tar.gz )
+	  amd64? ( mirror://vmware/software/vmserver/${MY_PN}.x86_64.tar.gz ) "
+
+LICENSE="vmware"
+IUSE=""
+SLOT="0"
+KEYWORDS="-* ~x86 ~amd64"
+RESTRICT="fetch strip"
+
+CDEPEND="
+	>=dev-lang/perl-5
+	>=sys-libs/glibc-2.3.5
+	sys-apps/pciutils"
+DEPEND="${CDEPEND}
+	sys-apps/findutils
+	x11-misc/shared-mime-info
+	virtual/os-headers"
+# vmware-server should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND="${CDEPEND}
+	~app-emulation/vmware-modules-208.2
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/libxml2
+	=media-libs/libpng-1.2*
+	sys-apps/hal
+	sys-fs/fuse
+	sys-libs/zlib
+	virtual/pam
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-misc/xdg-utils
+	!<sys-apps/dbus-0.62
+	!app-emulation/vmware-player
+	!app-emulation/vmware-workstation
+	"
+
+PDEPEND="app-emulation/vmware-vix"
+
+S=${WORKDIR}/vmware-server-distrib
+
+pkg_setup() {
+	if use x86; then
+		MY_P="${MY_PN}.i386"
+	elif use amd64; then
+		MY_P="${MY_PN}.x86_64"
+	fi
+}
+
+pkg_nofetch() {
+	if use x86; then
+		MY_P="${MY_PN}.i386"
+	elif use amd64; then
+		MY_P="${MY_PN}.x86_64"
+	fi
+
+	einfo "Please download the ${MY_P}.bundle from"
+	einfo "${DOWNLOAD_URL}"
+	einfo "and place it in ${DISTDIR}"
+}
+
+src_prepare() {
+	VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+	VMWARE_INSTALL_DIR=/opt/${PN//-//}
+
+	shortname="wgs"
+	product="vmware"
+	config_program="vmware-config.pl"
+	config_dir="/etc/vmware"
+	product_name="VMware Server 2"
+
+	enewgroup ${VMWARE_GROUP}
+
+	# Remove PAX MPROTECT flag from all applicable files in /bin, /sbin for
+	# the vmware package only (since modules, tools and console should not
+	# need to generate code on the fly in memory).
+	pax-mark -m $(list-paxables "${S}"/{bin{,-debug},sbin}/{vmware-serverd,vmware-vmx})
+
+	EPATCH_SOURCE="${FILESDIR}"/${PV} EPATCH_SUFFIX="patch" epatch
+
+	# Proper lsmod
+	sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${S}"/installer/services.sh || die "sed"
+	sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${S}"/lib/net-services.sh || die "sed"
+
+	# Set the name
+	sed -i -e "s:%LONGNAME%:${product_name}:" "${S}"/installer/services.sh || die "sed"
+	sed -i -e "s:%SHORTNAME%:${shortname}:" "${S}"/installer/services.sh || die "sed"
+
+	# We won't want any perl scripts from VMware once we've finally got all
+	# of the configuration done, but for now, they're necessary.
+	#rm -f *.pl bin/*.pl
+	rm -f *.pl
+	rm -f etc/installer.sh
+
+	# Since with Gentoo we compile everthing it doesn't make sense to keep
+	# the precompiled modules arround. Saves about 4 megs of disk space too.
+	rm -rf "${S}"/lib/modules/binary
+	# We also don't need to keep the icons around, or do we?
+	#rm -rf ${S}/lib/share/icons
+
+	rm -rf "${S}"/etc/pam.d/
+	sed -i -e "s:configure_wgs_pam_d():#&:" "${S}"/bin/vmware-config.pl || die "sed pam_d"
+}
+
+src_install() {
+	# We loop through our directories and copy everything to our system.
+	for x in bin lib sbin
+	do
+		if [[ -e "${S}/${x}" ]]
+		then
+			dodir "${VMWARE_INSTALL_DIR}"/${x}
+			cp -pPR "${S}"/${x}/* "${D}""${VMWARE_INSTALL_DIR}"/${x} \
+				|| die "copying ${x}"
+		fi
+	done
+
+	# Bug 282213
+	mv "${D}"/"${VMWARE_INSTALL_DIR}"/lib/lib/libpng12.so.0/libpng12.so.0 \
+	   "${D}"/"${VMWARE_INSTALL_DIR}"/lib/lib/libpng12.so.0/libpng12.so.0.old
+	dosym /usr/lib/libpng12.so.0 "${VMWARE_INSTALL_DIR}"/lib/lib/libpng12.so.0/libpng12.so.0
+
+	# Bug 292771
+	mv "${D}"/"${VMWARE_INSTALL_DIR}"/lib/lib/libexpat.so.0/libexpat.so.0 \
+	   "${D}"/"${VMWARE_INSTALL_DIR}"/lib/lib/libexpat.so.0/libexpat.so.0.old
+	dosym /usr/lib/libexpat.so.1 "${VMWARE_INSTALL_DIR}"/lib/lib/libexpat.so.0/libexpat.so.0
+	mv "${D}"/"${VMWARE_INSTALL_DIR}"/lib/lib/libxml2.so.2/libxml2.so.2 \
+	   "${D}"/"${VMWARE_INSTALL_DIR}"/lib/lib/libxml2.so.2/libxml2.so.2.old
+	dosym /usr/lib/libxml2.so.2 "${VMWARE_INSTALL_DIR}"/lib/lib/libxml2.so.2/libxml2.so.2
+
+	# If we have an /etc directory, we copy it.
+	if [[ -e "${S}/etc" ]]
+	then
+		dodir "${config_dir}"
+		cp -pPR "${S}"/etc/* "${D}""${config_dir}"
+		fowners root:${VMWARE_GROUP} "${config_dir}"
+		fperms 770 "${config_dir}"
+	fi
+
+	# If we have any helper files, we install them.  First, we check for an
+	# init script.
+	if [[ -e "${FILESDIR}/${PN}.rc" ]]
+	then
+		newinitd "${FILESDIR}"/${PN}.rc ${product} || die "newinitd"
+	fi
+	# Then we check for an environment file.
+	if [[ -e "${FILESDIR}/90${PN}" ]]
+	then
+		doenvd "${FILESDIR}"/90${PN} || die "doenvd"
+	fi
+	# Last, we check for any mime files.
+	if [[ -e "${FILESDIR}/${PN}.xml" ]]
+	then
+		insinto /usr/share/mime/packages
+		doins "${FILESDIR}"/${PN}.xml || die "mimetypes"
+	fi
+
+	# Blame bug #91191 for this one.
+	if [[ -e doc/EULA ]]
+	then
+		insinto "${VMWARE_INSTALL_DIR}"/doc
+		doins doc/EULA || die "copying EULA"
+	fi
+
+	# Do we have vmware-ping/vmware-vmx?  If so, make them setuid.
+	for p in /bin/vmware-ping /lib/bin/vmware-vmx /lib/bin-debug/vmware-vmx /lib/bin/vmware-vmx-debug /sbin/vmware-authd;
+	do
+		if [ -x "${D}${VMWARE_INSTALL_DIR}${p}" ]
+		then
+			fowners root:${VMWARE_GROUP} "${VMWARE_INSTALL_DIR}"${p}
+			fperms 4750 "${VMWARE_INSTALL_DIR}"${p}
+		fi
+	done
+
+	# This removed the user/group warnings
+	# But also broke vmware-server with FEATURES="userpriv" since it removes
+	# the set-UID bit
+	#chown -R root:${VMWARE_GROUP} ${D} || die
+
+	# We like desktop icons.
+	# TODO: Fix up the icon creation, across the board.
+	#make_desktop_entry ${PN} "${product_name}" ${PN}.png
+
+	# Now, we copy in our services.sh file
+	exeinto "${config_dir}"/init.d
+	newexe installer/services.sh ${product} || die "services.sh"
+
+	newinitd "${FILESDIR}/vmware-server-2.rc" vmware
+
+	# startup symlinks
+	dosym ${config_dir}/init.d/${product} ${config_dir}/init.d/vmware-autostart
+	dosym ${config_dir}/init.d/${product} ${config_dir}/init.d/vmware-core
+	dosym ${config_dir}/init.d/${product} ${config_dir}/init.d/vmware-mgmt
+
+	# pam
+	pamd_mimic_system vmware-authd auth account
+
+	# Man pages and docs
+	dodoc doc/*
+	doman man/man1/*
+
+	# VMware authorization service
+	insinto ${config_dir}/hostd
+	doins "${FILESDIR}/authorization.xml"
+
+	# Finally, we run the "Questions"
+	einfo "Adding answers to ${config_dir}/locations"
+	locations="${D}${config_dir}/locations"
+	echo "answer BINDIR ${VMWARE_INSTALL_DIR}/bin" >> ${locations}
+	echo "answer LIBDIR ${VMWARE_INSTALL_DIR}/lib" >> ${locations}
+	echo "answer MANDIR ${VMWARE_INSTALL_DIR}/man" >> ${locations}
+	echo "answer DOCDIR ${VMWARE_INSTALL_DIR}/doc" >> ${locations}
+	echo "answer SBINDIR ${VMWARE_INSTALL_DIR}/sbin" >> ${locations}
+	echo "answer RUN_CONFIGURATOR no" >> ${locations}
+	echo "answer INITDIR ${config_dir}/init.d" >> ${locations}
+	echo "answer INITSCRIPTSDIR ${config_dir}/init.d" >> ${locations}
+	echo "answer VMCI_CONFED yes" >> ${locations}
+	echo "answer VSOCK_CONFED yes" >> ${locations}
+}
+
+pkg_config() {
+	einfo "Running ${VMWARE_INSTALL_DIR}/bin/vmware-config.pl"
+	"${VMWARE_INSTALL_DIR}/bin/vmware-config.pl"
+}
+
+pkg_preinst() {
+	# This must be done after the install to get the mtimes on each file
+	# right.
+
+	#Note: it's a bit weird to use ${D} in a preinst script but it should work
+	#(drobbins, 1 Feb 2002)
+
+	einfo "Generating ${config_dir}/locations file."
+	d=`echo ${D} | wc -c`
+	for x in `find ${D}${VMWARE_INSTALL_DIR} ${D}${config_dir}` ; do
+		x="`echo ${x} | cut -c ${d}-`"
+		if [ -d "${D}/${x}" ] ; then
+			echo "directory ${x}" >> "${D}${config_dir}"/locations
+		else
+			echo -n "file ${x}" >> "${D}${config_dir}"/locations
+			if [ "${x}" == "${config_dir}/locations" ] ; then
+				echo "" >> "${D}${config_dir}"/locations
+			elif [ "${x}" == "${config_dir}/not_configured" ] ; then
+				echo "" >> "${D}${config_dir}"/locations
+			else
+				echo -n " " >> "${D}${config_dir}"/locations
+				find "${D}${x}" -printf %T@ >> "${D}${config_dir}"/locations
+				echo "" >> "${D}${config_dir}"/locations
+			fi
+		fi
+	done
+}
+
+pkg_postinst() {
+	update-mime-database /usr/share/mime
+	[[ -d "${config_dir}" ]] && chown -R root:${VMWARE_GROUP} ${config_dir}
+
+	# This is to fix the problem where the not_configured file doesn't get
+	# removed when the configuration is run. This doesn't remove the file
+	# It just tells the vmware-config.pl script it can delete it.
+	einfo "Updating ${config_dir}/locations"
+	for x in "${config_dir}"/._cfg????_locations ; do
+		if [ -f $x ] ; then
+			cat $x >> "${config_dir}"/locations
+			rm $x
+		fi
+	done
+
+	ewarn "Use "
+	ewarn "  emerge vmware-server --config"
+	ewarn "to configure your installation of ${product_name}."
+
+	ewarn "In order to run ${product_name}, you have to"
+	ewarn "be in the '${VMWARE_GROUP}' group."
+
+	#ewarn "By default xinetd only allows connections from localhost"
+	#ewarn "To allow external users access to vmware-server you must edit"
+	#ewarn "    /etc/xinetd.d/vmware-authd"
+	#ewarn "and specify a new 'only_from' line"
+
+	ewarn "VMWare Server also has issues when running on a JFS filesystem.  For more"
+	ewarn "information see http://bugs.gentoo.org/show_bug.cgi?id=122500#c94"
+}
+
+pkg_prerm() {
+	einfo "Stopping ${product_name} for safe unmerge"
+	/etc/init.d/vmware stop
+}
+
+pkg_postrm() {
+	if ! has_version app-emulation/${PN}; then
+		elog "To remove all traces of ${product} you will need to remove the files"
+		elog "in ${config_dir} and /etc/init.d/${product}."
+		elog "If the vmware-modules package is installed, you may no longer need it."
+	fi
+}