diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index 2f0e1a2f..c8e6adfe 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 May 2009; Mario Fetka <mario.fetka@gmail.com>
+  vmware-modules-138.9.ebuild:
+  use upstream package as source for modules
+
   30 May 2009; Mario Fetka <mario.fetka@gmail.com>
   vmware-modules-138.9.ebuild:
   drop 2.6.29 support
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index df247b51..cbd4108f 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -1,5 +1,5 @@
-DIST vmware-modules-138.9-genpatches-2.tar.bz2 4273 RMD160 1fed85d696bccaaebaae09fade948be42c5bb17e SHA1 8b99f767f1ca7aed4308207f9d99bb108b79d833 SHA256 81387ec2bc286c242647bfa7ba0ad846bc03196747f250ff8b39fe739afb9646
-DIST vmware-modules-138.9.tar.bz2 186156 RMD160 f65fef3dd58e801eda9ef7b8ae6a1819ce11be92 SHA1 4933ffb1186c1d861ad1be776aa84751a052e0de SHA256 ee2038a6f070173ac0172c959444bfb1dd493569abf1d1522638797348697572
-EBUILD vmware-modules-138.9.ebuild 469 RMD160 6b5e8f54d0fbd78f3eef288e46a6bddeb5cfd704 SHA1 1d7efb181105f6214cd3e147c08aea0fa9d23e3b SHA256 0e5a435f1c649cb8261da182c1224863b39d82ed2f91c56b1ebe843c8cc1579f
-MISC ChangeLog 1189 RMD160 93d0cafe9680a3f3d3c68b9dcdb66dc077c89b91 SHA1 8aed7eb12a11e9c90dfa0938b785cd80951334cf SHA256 8432a8b77d7f41698b966ee2e5e64833da092dbaf184519ba350c9ef570ce807
+DIST VMware-server-1.0.9-156507.tar.gz 107164305 RMD160 1ba44b50b1f516eb8f253e475d6b2c7b5eeb8ade SHA1 ba6e7a7b69e312e177d54c8272de25574e3d5ddb SHA256 e1c049328141f6ea77d31b38fa920d2adff5756a063fb38964faefe928cbd94c
+DIST vmware-modules-138.9-genpatches-1.tar.bz2 7423 RMD160 e7a17d9f7e92e2e3890d278d99f4c1ae0db02d54 SHA1 673c5b00a8d23c21418ce533ab1e5395b474cc45 SHA256 1ac5e5fbb346dacdd48f14bc948b07fd6ce33064d2dada5c90e9fe61886eeca4
+EBUILD vmware-modules-138.9.ebuild 617 RMD160 273d5ed74f05c10a88a9c3bb795383ac775763a0 SHA1 5d4234bbd5e634136b1bc35a040b313e82c74255 SHA256 5dd4296e4bbd22c20b64e0d410baa96b373282e92255966dbc1489cef752ee59
+MISC ChangeLog 1317 RMD160 7e6a1e81940cf2727a86aa403a3b0c6706c2566d SHA1 48a0e41b611d8c0a372db3ccd76a3bda4c750239 SHA256 e56075912a97e4b8f8b513f206c0f8439641e2df0a16b2c9ece978347bc172c7
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
diff --git a/app-emulation/vmware-modules/vmware-modules-138.9.ebuild b/app-emulation/vmware-modules/vmware-modules-138.9.ebuild
index aae4acc3..1f2727d1 100644
--- a/app-emulation/vmware-modules/vmware-modules-138.9.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-138.9.ebuild
@@ -4,11 +4,16 @@
 
 EAPI="2"
 
-KEYWORDS="~amd64 ~x86"
-GENPATCHES_VER="2"
+GENPATCHES_VER="1"
+VM_SRC_URI="mirror://vmware/software/vmserver/VMware-server-1.0.9-156507.tar.gz"
 
 inherit vmware-mod-2
 
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/vmware-server-distrib/lib/modules/source/
+
 pkg_setup() {
 	if kernel_is ge 2 6 25; then
 		CONFIG_CHECK="UNUSED_SYMBOLS"