diff --git a/app-emulation/vmware-server-console/ChangeLog b/app-emulation/vmware-server-console/ChangeLog
index 26df6f3..4ebb15d 100644
--- a/app-emulation/vmware-server-console/ChangeLog
+++ b/app-emulation/vmware-server-console/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server-console/ChangeLog,v 1.41 2009/05/09 21:59:41 ikelos Exp $
 
+*vmware-server-console-1.0.10.203137-r50 (26 Dec 2010)
+
+  26 Dec 2010; Mario Fetka <mario.fetka@gmail.com>
+  +vmware-server-console-1.0.10.203137-r50.ebuild:
+  add multilib aware conssole ebuild
+
   19 Aug 2010; Mario Fetka <mario.fetka@gmail.com>
   vmware-server-console-1.0.10.203137.ebuild:
   Bump
diff --git a/app-emulation/vmware-server-console/Manifest b/app-emulation/vmware-server-console/Manifest
index c97d64c..c5fb3ed 100644
--- a/app-emulation/vmware-server-console/Manifest
+++ b/app-emulation/vmware-server-console/Manifest
@@ -3,8 +3,9 @@ AUX vmware-server-console.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e
 DIST VMware-server-linux-client-1.0.10-203137.zip 23775696 RMD160 8f5cd2646b68aa0acc93ba6288993e31af8a06b2 SHA1 3f92c98153f5d9dcbbcd0cd524683a6832aaa10e SHA256 143a2ab8604706e2fe0cd9a6f824e8f9338c1db9fc6e51a5ea8316efe934448c
 DIST VMware-server-linux-client-1.0.8-126538.zip 23697857 RMD160 470b1b612ff55128a856da6025bb0b9130f42602 SHA1 20dc3e08eedabdd66fd6094fa5d17f1c37bb4d8e SHA256 cb81942ebea0551d32ae54fd9aa1f7d77a4c018729ea811cc65adba41e7ee683
 DIST VMware-server-linux-client-1.0.9-156507.zip 23772932 RMD160 e96e94e4173f4e5fa05ff74ab5637472e1398d4a SHA1 4aa99c8f72f13f1cbbfa21bf35014c386b1156c4 SHA256 c0735562ab900f02ff954b7f907fd0e57f25c3073ec932f0a684460c8ea4b3e7
+EBUILD vmware-server-console-1.0.10.203137-r50.ebuild 7933 RMD160 1e9d8f53842bc7dd6c88691d40abad782f5d3801 SHA1 46a12a6009333147871fc8cb482e138eea022f5d SHA256 5605e11f9690219b032c1069b4598c55d887175ab4a935b3958e23c4c937aa79
 EBUILD vmware-server-console-1.0.10.203137.ebuild 2135 RMD160 a1b0b0740b66e66c70fcd141be6e007f61a66f5d SHA1 9df1b2d776eab3b092d4ba53e21c0f489b789908 SHA256 0eba40f6764f2a7a4da12ff7bb159be6424715fa64b91da8e54deb8419077305
 EBUILD vmware-server-console-1.0.8.126538.ebuild 2139 RMD160 ffe61628eeec39617a9d57c1cf5ad7fca2621333 SHA1 9809397c8a5ceae1120d8fae19ea7738eba4e64c SHA256 eaec6890576838088fa254f8edb267a80d10623172466f9822c327ea333ca795
 EBUILD vmware-server-console-1.0.9.156507.ebuild 2141 RMD160 4999a4bc91df3f124cd3ab59a4b73c777278ada4 SHA1 53b8f439b5c48e8392bd9dac29501654eb8abae7 SHA256 c22f8bffa1da17eec984d2645912e349e8befe6ee3156207190f0738581c85c5
-MISC ChangeLog 7459 RMD160 b2759401d3458c6dddf9d365a682e107d35031c5 SHA1 d9124fd646c9818cb0c71ad5804deec84d91f2ba SHA256 735d9d77e66b9f6c66de7052ed0fbcf7ca7a5f09583e6b07b369d376d45e2ff0
+MISC ChangeLog 7655 RMD160 2dfafdba19e6ef1758780548a2b36305bdcb18f9 SHA1 1041588e6979d1570b5a91efd1ee9b5d00d66449 SHA256 d4b98a164dccc26e90aad69bb48bc1b354d9dfdf7e184612e2a68b66384b32a9
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
diff --git a/app-emulation/vmware-server-console/vmware-server-console-1.0.10.203137-r50.ebuild b/app-emulation/vmware-server-console/vmware-server-console-1.0.10.203137-r50.ebuild
new file mode 100644
index 0000000..36a6f01
--- /dev/null
+++ b/app-emulation/vmware-server-console/vmware-server-console-1.0.10.203137-r50.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# 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 versionator fdo-mime gnome2-utils
+
+MY_PN=${PN/vm/VM}
+MY_PV=$(replace_version_separator 3 '-')
+MY_P="${MY_PN}-${MY_PV}"
+FN="VMware-server-linux-client-${MY_PV}"
+S="${WORKDIR}/${PN}-distrib"
+
+DESCRIPTION="VMware Remote Console for Linux"
+HOMEPAGE="http://www.vmware.com/"
+SRC_URI="mirror://vmware/software/vmserver/${FN}.zip"
+
+LICENSE="vmware"
+IUSE="doc"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="strip"
+
+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[multilib_abi_x86]
+	sys-libs/libstdc++-v3[multilib_abi_x86]
+	dev-cpp/atkmm[multilib_abi_x86]
+	dev-cpp/glibmm:2[multilib_abi_x86]
+	dev-cpp/gtkmm:2.4[multilib_abi_x86]
+	dev-cpp/libgnomecanvasmm:2.6[multilib_abi_x86]
+	dev-cpp/libsexymm:1[multilib_abi_x86]
+	dev-cpp/pangomm:2.4[multilib_abi_x86]
+	dev-libs/atk[multilib_abi_x86]
+	dev-libs/expat:1.95[multilib_abi_x86]
+	dev-libs/glib:2[multilib_abi_x86]
+	dev-libs/libsigc++:2[multilib_abi_x86]
+	dev-libs/libxml2:2[multilib_abi_x86]
+	gnome-base/libglade:2.0[multilib_abi_x86]
+	gnome-base/libgnomecanvas[multilib_abi_x86]
+	gnome-base/librsvg:2[multilib_abi_x86]
+	media-libs/fontconfig:1.0[multilib_abi_x86]
+	media-libs/freetype:2[multilib_abi_x86]
+	media-libs/libart_lgpl[multilib_abi_x86]
+	sys-libs/zlib[multilib_abi_x86]
+	x11-libs/gdk-pixbuf:2[multilib_abi_x86]
+	x11-libs/gtk+:2[multilib_abi_x86]
+	x11-libs/libICE[multilib_abi_x86]
+	x11-libs/libSM[multilib_abi_x86]
+	x11-libs/libX11[multilib_abi_x86]
+	x11-libs/libXext[multilib_abi_x86]
+	x11-libs/libXft[multilib_abi_x86]
+	x11-libs/libXi[multilib_abi_x86]
+	x11-libs/libXrender[multilib_abi_x86]
+	x11-libs/libXt[multilib_abi_x86]
+	x11-libs/libXtst[multilib_abi_x86]
+	x11-libs/libsexy:1[multilib_abi_x86]
+	x11-libs/libview[multilib_abi_x86]
+	x11-libs/pango[multilib_abi_x86]
+	>=dev-lang/perl-5
+	!<sys-apps/dbus-0.62"
+
+
+S=${WORKDIR}/${PN}-distrib
+VM_INSTALL_DIR="/opt/vmware/server/console"
+VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+
+src_unpack() {
+	unpack ${A}
+	unpack ./${MY_P}.tar.gz
+}
+
+src_prepare() {
+	rm -f bin/vmware-uninstall-server-console.pl
+
+	# remove superfluous libraries
+	ebegin 'Removing superfluous libraries'
+	cd lib/lib || die
+	# exclude OpenSSL from unbundling until the AES-NI patch gets into the tree
+	ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | fgrep -vx 'libcrypto.so.0.9.7
+libssl.so.0.9.7' 'libstdc++.so.5' | xargs -d'\n' -r rm -rf
+	eend
+}
+
+src_install() {
+	local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
+	local build=$(get_version_component_range 4 "${PV}")
+
+	# install the binaries
+	into "${VM_INSTALL_DIR}"
+	dobin bin/* || die "failed to install bin"
+
+	# install the libraries
+	insinto "${VM_INSTALL_DIR}"/lib
+	doins -r lib/* || die "failed to install lib"
+
+	# commented out until Portage gets OpenSSL 0.9.8 with AES-NI support
+	# see http://forums.gentoo.org/viewtopic-t-835867.html
+	## these two libraries do not like to load from /usr/lib*
+	#local each ; for each in libcrypto.so.0.9.8 libssl.so.0.9.8 ; do
+	#	if [[ ! -f "${VM_INSTALL_DIR}/lib/vmware/lib/${each}" ]] ; then
+	#		dosym "/usr/$(get_libdir)/${each}" \
+	#			"${VM_INSTALL_DIR}/lib/vmware/lib/${each}/${each}"
+	#	fi
+	#done
+
+	# install documentation
+	if use doc; then
+		dodoc doc/* || die "failed to install docs"
+	fi
+
+	# fix up permissions
+	chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/{bin/*,lib/wrapper-gtk24.sh}
+
+	# create the environment
+	local envd="${T}/90vmware-server-console"
+	cat > "${envd}" <<-EOF
+		PATH='${VM_INSTALL_DIR}/bin'
+		ROOTPATH='${VM_INSTALL_DIR}/bin'
+	EOF
+	doenvd "${envd}" || die
+
+	# create the configuration
+	dodir /etc/vmware-server-console || die
+
+	cat > "${D}"/etc/vmware-server-console/locations <<-EOF
+		answer BINDIR ${VM_INSTALL_DIR}/bin
+		answer LIBDIR ${VM_INSTALL_DIR}/lib
+		answer MANDIR ${VM_INSTALL_DIR}/man
+		answer DOCDIR ${VM_INSTALL_DIR}/doc
+	EOF
+
+	cat > "${D}"/etc/vmware-server-console/config <<-EOF
+		bindir = "${VM_INSTALL_DIR}/bin"
+		libdir = "${VM_INSTALL_DIR}/lib"
+	EOF
+
+	# Copy files from /etc directory.
+	cp -pPR etc/* "${D}"/etc/vmware-server-console
+	fowners -R root:${VMWARE_GROUP} /etc/vmware-server-console
+	fperms 770 /etc/vmware-server-console
+
+	# fill in variable placeholders
+	sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/libconf:g" \
+		-i "${D}${VM_INSTALL_DIR}"/lib/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die
+#	sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
+#		-i "${D}/usr/share/applications/${PN}.desktop" || die
+
+	doman man/man1/*
+
+	# Blame bug #91191 for this one.
+	insinto "${VM_INSTALL_DIR}"/doc
+	doins doc/EULA || die "copying EULA"
+
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}"/${PN}.xml || die "mimetypes"
+
+	newicon doc/icon48x48.png ${PN}.png
+	make_desktop_entry ${PN} "VMWare Remote Console" ${PN} System
+
+	dodir /usr/bin
+	dosym ${VM_INSTALL_DIR}/bin/${PN} /usr/bin/${PN}
+}
+
+pkg_config() {
+	"${VM_INSTALL_DIR}"/bin/vmware-config-server-console.pl
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	#Note: it's a bit weird to use ${D} in a preinst script but it should work
+	#(drobbins, 1 Feb 2002)
+
+	einfo "Generating /etc/vmware-server-console/locations file."
+	d=`echo ${D} | wc -c`
+	for x in `find ${D}${VM_INSTALL_DIR} ${D}/etc/vmware-server-console` ; do
+		x="`echo ${x} | cut -c ${d}-`"
+		if [ -d "${D}/${x}" ] ; then
+			echo "directory ${x}" >> "${D}/etc/vmware-server-console"/locations
+		else
+			echo -n "file ${x}" >> "${D}/etc/vmware-server-console"/locations
+			if [ "${x}" == "/etc/vmware-server-console/locations" ] ; then
+				echo "" >> "${D}/etc/vmware-server-console"/locations
+			elif [ "${x}" == "/etc/vmware-server-console/not_configured" ] ; then
+				echo "" >> "${D}/etc/vmware-server-console"/locations
+			else
+				echo -n " " >> "${D}/etc/vmware-server-console"/locations
+				find ${D}${x} -printf %T@ >> "${D}/etc/vmware-server-console"/locations
+				echo "" >> "${D}/etc/vmware-server-console"/locations
+			fi
+		fi
+	done
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	update-mime-database /usr/share/mime
+
+	ewarn "/etc/env.d was updated. Please run:"
+	ewarn "env-update && source /etc/profile"
+	ewarn ""
+	ewarn "Before you can use vmware-server-console, you must configure a default network setup."
+	ewarn "You can do this by running 'emerge --config ${PN}'."
+
+	chown -R root:${VMWARE_GROUP} /etc/vmware-server-console
+
+	# 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 /etc/vmware-server-console/locations"
+	for x in "/etc/vmware-server-console"/._cfg????_locations ; do
+		if [ -f $x ] ; then
+			cat $x >> "/etc/vmware-server-console"/locations
+			rm $x
+		fi
+	done
+
+	echo
+	elog "You need to run "
+	elog "    ${VM_INSTALL_DIR}/bin/vmware-config-server-console.pl"
+	elog "to complete the install."
+	echo
+	einfo "For VMware Add-Ons just visit"
+	einfo "http://www.vmware.com/download/downloadaddons.html"
+	echo
+	elog "After configuring, run ${PN} to launch"
+	echo
+	ewarn "Remember, in order to run VMware Server Console, you have to"
+	ewarn "be in the '${VMWARE_GROUP}' group."
+	echo
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	if ! has_version app-emulation/${PN}; then
+		echo
+		elog "To remove all traces of Server Console you will need to remove the files"
+		elog "in /etc/vmware-server-console."
+		echo
+	fi
+}
+