diff --git a/app-emulation/vmware-server-console/Manifest b/app-emulation/vmware-server-console/Manifest
index 143ee49..73e8fdb 100644
--- a/app-emulation/vmware-server-console/Manifest
+++ b/app-emulation/vmware-server-console/Manifest
@@ -1,7 +1,9 @@
 AUX 90vmware-server-console 76 RMD160 22fed127d20bfb758163443dcbd2879bf1d49be6 SHA1 105e3194c134b752a8d5cef1a23ae621cd835d80 SHA256 ff3abe9d58fd673d8f3d2f7e967aa6db426e3e15b4d868dc1483682357a928b8
+AUX vmsc-force-included-gtk.patch 285 RMD160 d7d7624f3fd679c5a2db9ad4f60ced103014e855 SHA1 abbfdf6d9738b372040b9e535eba9922c5a75204 SHA256 5beed60cf7335997e60f6001a6c2137a5f73db7af4fac18f1a12c5d8adc3e2cb
+AUX vmsc-wrapper-gtk24.sh.patch 677 RMD160 f2060c4055809c0a53847672f0bef7f342ab3c11 SHA1 1060d7e58efd12df214f1debe6557af97716652c SHA256 10f755d4b10ee785308db1bd6f6ad75270ccbf8725f55c10bf0aa33a1845ce62
 AUX vmware-server-console.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
 DIST VMware-server-linux-client-1.0.10-203137.zip 23775696 RMD160 8f5cd2646b68aa0acc93ba6288993e31af8a06b2 SHA1 3f92c98153f5d9dcbbcd0cd524683a6832aaa10e SHA256 143a2ab8604706e2fe0cd9a6f824e8f9338c1db9fc6e51a5ea8316efe934448c
-EBUILD vmware-server-console-1.0.10.203137-r50.ebuild 8347 RMD160 2e7f5af8a716d08de51f073977548764c5e03543 SHA1 a5b24b04a4ca2813350f9c196e7b816aa8d407cd SHA256 337081794884111137fc42c11ba8d391fd8c5365aabf6dfec0788e48b086cffc
+EBUILD vmware-server-console-1.0.10.203137-r50.ebuild 9199 RMD160 a844b2732f40ee32324902faac39f8dd527cecd7 SHA1 a2ca0a5a94900e2667eddb74c302babd8454a3ea SHA256 625a7d61e14aca81e08062bce9dc76dc45f0131a7626aa3ce84276b721d5f3e7
 EBUILD vmware-server-console-1.0.10.203137.ebuild 2135 RMD160 a1b0b0740b66e66c70fcd141be6e007f61a66f5d SHA1 9df1b2d776eab3b092d4ba53e21c0f489b789908 SHA256 0eba40f6764f2a7a4da12ff7bb159be6424715fa64b91da8e54deb8419077305
 MISC ChangeLog 8233 RMD160 26012997e3aa727e893382fcdb1218830af2a848 SHA1 d9b7f2b4b7732e9bdd809e0105686aa2e9e2f25f SHA256 2f975e186b551598d2c72204d460ca94cfd19f1b290edaf6576c6e0b18ee138b
 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
index a4d613d..6b46ce8 100644
--- 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
@@ -76,28 +76,90 @@ S="${WORKDIR}"/${PN}-distrib
 VM_INSTALL_DIR="/opt/vmware/server/console"
 VMWARE_GROUP=${VMWARE_GROUP:-vmware}
 
+pkg_setup() {
+	enewgroup "${VMWARE_GROUP}"
+}
+
+
 src_unpack() {
 	unpack ${A}
 	unpack ./${MY_P}.tar.gz
 }
 
 src_prepare() {
-	# renove unistall script
+	epatch "${FILESDIR}/vmsc-force-included-gtk.patch"
+	epatch "${FILESDIR}/vmsc-wrapper-gtk24.sh.patch"
+	# remove unistall script
 	rm -f bin/vmware-uninstall-server-console.pl
 	# we dont need the prepacked modules
 #	rm -Rf lib/libconf/lib
-	rm -Rf lib/libgcc_s.so.1
+	rm -Rf lib/lib/libgcc_s.so.1
 	# correct the config files for the multilib portage version (lib32)
 #	ABI=x86 gdk-pixbuf-query-loaders > lib/libconf/etc/gtk-2.0/gdk-pixbuf.loaders
 #	ABI=x86 gtk-query-immodules-2.0 > lib/libconf/etc/gtk-2.0/gtk.immodules
 #	ABI=x86 pango-querymodules > lib/libconf/etc/pango/pango.modules
 
+#	die
 	# 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 'libview.so.2' | xargs -d'\n' -r rm -rf
+#	ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> /.*$:\1:g;t;d' | \
+#	fgrep -vx '
+#libview.so.2
+
+#libglib-2.0.so.0
+#libglibmm_generate_extra_defs-2.4.so.1
+#libglibmm-2.4.so.1
+#libgmodule-2.0.so.0
+#libgobject-2.0.so.0
+#libgthread-2.0.so.0
+
+#libatk-1.0.so.0
+#libatkmm-1.6.so.1
+
+#libpango-1.0.so.0
+#libpangoft2-1.0.so.0
+#libpangoxft-1.0.so.0
+#libpangox-1.0.so.0
+#libpangomm-1.4.so.1
+
+#libgdk-x11-2.0.so.0
+#libgdkmm-2.4.so.1
+#libgdk_pixbuf-2.0.so.0
+#libgtk-x11-2.0.so.0
+#libgtkmm-2.4.so.1
+
+#libsexy.so.1
+#libsexymm.so.1
+
+#libgnomecanvas-2.so.0
+#libgnomecanvasmm-2.6.so.1
+
+#' | xargs -d'\n' -r rm -rf
 #	eend
+
+
+#support libs
+#libfreetype.so.6
+#libXft.so.2
+#libXrender.so.1
+
+#libfontconfig.so.1
+
+#libexpat.so.0
+
+#libart_lgpl_2.so.2
+
+#libxml2.so.2
+
+#libglade-2.0.so.0
+
+#libcrypto.so.0.9.7
+#libssl.so.0.9.7
+
+#librsvg-2.so.2
+
 }
 
 src_install() {
diff --git a/app-emulation/vmware-server/Manifest b/app-emulation/vmware-server/Manifest
index c26d949..f4ee750 100644
--- a/app-emulation/vmware-server/Manifest
+++ b/app-emulation/vmware-server/Manifest
@@ -25,7 +25,7 @@ DIST VMware-server-1.0.10-203137.tar.gz 107183610 RMD160 0ddaa6a6f5b3c08804eb1b9
 DIST VMware-server-2.0.2-203138.i386.tar.gz 506047036 RMD160 3119bf56e1ef9c63dfcb969d951cd78bd9c667e1 SHA1 2917c8d4e521cb9af186be8fcaf2043b1a516a6c SHA256 b4779515e2a8ecc4d768c07f9264aeb94e45986262626a3a557466e77f371662
 DIST VMware-server-2.0.2-203138.x86_64.tar.gz 474415801 RMD160 0778f78122ee6b701543df5885ad1e8d3325fb82 SHA1 b65d3d46dc947fc7995bda354c4947afabd23474 SHA256 a1230f43f6b668a751e9ce2c9d2f6a2c75e4d4cea88f583901f67dbd67412e25
 DIST vmware-server-perl-fixed-rpath-libs.tar.bz2 73834 RMD160 7f64627b5b945e8d7dabe39c165a4b66b71fb4d3 SHA1 9d696750ca3ec92b31ca8112fd80dcd832494044 SHA256 c42299dd033187c67b45b739da66583fbd94cdcba745200b89a25ac96cd9364b
-EBUILD vmware-server-1.0.10.203137-r1.ebuild 2894 RMD160 c0dd0133c2b2c296b40299092fca94282e4a5d32 SHA1 47abd4891c48e49824526ac2ee167be4a7ba84af SHA256 c38b3680f4d8fe32dba60cda40ae736db9c56988a927066d673c0f3e11fae1d9
+EBUILD vmware-server-1.0.10.203137-r1.ebuild 3065 RMD160 e15493e44aaf4f0c68494fae08cdb1912fa5010a SHA1 694cc31af9dcbd248796d0096bdcf40166d09590 SHA256 052017bf7f131a84b98553604ce8566f2efbf681c6a384d61de3194b42068862
 EBUILD vmware-server-2.0.2.203138-r4.ebuild 8800 RMD160 454c493252d9bf21f3294e9aba868a592ed3c0a8 SHA1 583b46069d84459485dbac2d350309f55efa801a SHA256 96a7eab21911df738d5bcadbbb6f69a22b6634f2f217630b9c5c4072d1654ec6
 MISC ChangeLog 815 RMD160 393225a479c0ea208c3d6f63c28a68a670ed0432 SHA1 ef761a5935dc9bae2a656f4818bd849e2be131de SHA256 c7199722e7b68996b8dd0376e7e0bf70b1bdb5e85aa8bb4e6f048156e9c37221
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
diff --git a/app-emulation/vmware-server/vmware-server-1.0.10.203137-r1.ebuild b/app-emulation/vmware-server/vmware-server-1.0.10.203137-r1.ebuild
index 04dee47..b37fa8b 100644
--- a/app-emulation/vmware-server/vmware-server-1.0.10.203137-r1.ebuild
+++ b/app-emulation/vmware-server/vmware-server-1.0.10.203137-r1.ebuild
@@ -68,6 +68,10 @@ src_unpack() {
 	# patch the vmware /etc/pam.d file to ensure that only
 	# vmware group members can log in
 	cp "${FILESDIR}/vmware-authd" "${S}/etc/pam.d/vmware-authd"
+
+	# 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"
 }
 
 src_install() {
@@ -76,7 +80,7 @@ src_install() {
 	# Fix the amd64 emulation pam stuff
 	use amd64 && dosed "s:pam_:/lib32/security/pam_:" ${config_dir}/pam.d/vmware-authd
 	  # Remove libpam on amd64 because it's linked against the wrong paths
-	use amd64 && rm "${D}/opt/vmware/server/lib/lib/libpam.so.0/libpam.so"
+	use amd64 && rm -rf "${D}/opt/vmware/server/lib/lib/libpam.so.0"
 
 	echo "${VMWARE_GROUP}" > "${D}${config_dir}/vmwaregroup"
 
diff --git a/profiles/packages.unmask b/profiles/packages.unmask
index c8815af..5f5303d 100644
--- a/profiles/packages.unmask
+++ b/profiles/packages.unmask
@@ -5,3 +5,11 @@
 # due to end of support (upstream) and
 # security issue: bug 385727
 =app-emulation/vmware-modules-138.10
+
+#required by app-emulation/vmware-server-2.0.2.203138-r4, required by =vmware-server-2.0.2.203138-r4 (argument)
+# /usr/portage/profiles/package.mask:
+# Vadim Kuznetsov <vadimk@gentoo.org> (05 Nov 2011)
+# Masked for removal in 30 days
+# due to end of support (upstream) and
+# security issue: bug 385727
+=app-emulation/vmware-modules-208.2