diff --git a/eclass/sabayon-kernel.eclass b/eclass/sabayon-kernel.eclass
index f0c2ea8ca..892bb66ab 100644
--- a/eclass/sabayon-kernel.eclass
+++ b/eclass/sabayon-kernel.eclass
@@ -10,8 +10,8 @@
 # @ECLASS-VARIABLE: K_SABKERNEL_NAME
 # @DESCRIPTION:
 # The kernel name used by the ebuild, it should be the ending ${PN} part
-# for example, of linux-sabayon it is "sabayon", for linux-server it is "server"
-K_SABKERNEL_NAME="${K_SABKERNEL_NAME:-sabayon}"
+# for example, of linux-sabayon it is "${PN/${PN/-*}-}" (sabayon)
+K_SABKERNEL_NAME="${K_SABKERNEL_NAME:-${PN/${PN/-*}-}}"
 
 # @ECLASS-VARIABLE: K_SABKERNEL_URI_CONFIG
 # @DESCRIPTION:
@@ -39,11 +39,6 @@ K_KERNEL_PATCH_VER="${K_KERNEL_PATCH_VER:-}"
 # pointing to space separated list of patch paths.
 K_KERNEL_PATCH_HOTFIXES="${K_KERNEL_PATCH_HOTFIXES:-}"
 
-# @ECLASS-VARIABLE: K_SABKERNEL_FIRMWARE
-# @DESCRIPTION:
-# Set this to "1" if your ebuild is a kernel firmware package
-K_FIRMWARE_PACKAGE="${K_FIRMWARE_PACKAGE:-}"
-
 # @ECLASS-VARIABLE: K_KERNEL_DISABLE_PR_EXTRAVERSION
 # @DESCRIPTION:
 # Set this to "1" if you want to tell kernel-2 eclass to
@@ -51,6 +46,18 @@ K_FIRMWARE_PACKAGE="${K_FIRMWARE_PACKAGE:-}"
 # this to "0" to not set K_NOUSEPR at all.
 K_KERNEL_DISABLE_PR_EXTRAVERSION="${K_KERNEL_DISABLE_PR_EXTRAVERSION:-1}"
 
+# @ECLASS-VARIABLE: K_KERNEL_SLOT_USEPVR
+# @DESCRIPTION:
+# Set this to "1" if you want to use ${PVR} in SLOT variable, instead of ${PV}
+# sys-kernel/linux-vserver (vserver-sources) require this. This won't work for
+# firmware pkgs.
+K_KERNEL_SLOT_USEPVR="${K_KERNEL_SLOT_USEPVR:-0}"
+
+# @ECLASS-VARIABLE: K_SABKERNEL_FIRMWARE
+# @DESCRIPTION:
+# Set this to "1" if your ebuild is a kernel firmware package
+K_FIRMWARE_PACKAGE="${K_FIRMWARE_PACKAGE:-}"
+
 # @ECLASS-VARIABLE: K_ONLY_SOURCES
 # @DESCRIPTION:
 # For every kernel binary package, there is a kernel source package associated
@@ -62,11 +69,6 @@ KERN_INITRAMFS_SEARCH_NAME="${KERN_INITRAMFS_SEARCH_NAME:-initramfs-genkernel*${
 # Disable deblobbing feature
 K_DEBLOB_AVAILABLE=0
 
-# Do not use PR for kernel versioning (EXTRAVERSION)
-if [ "${K_KERNEL_DISABLE_PR_EXTRAVERSION}" = "1" ]; then
-	K_NOUSEPR="1"
-fi
-
 inherit eutils kernel-2 sabayon-artwork mount-boot linux-mod
 
 # from kernel-2 eclass
@@ -97,16 +99,25 @@ if [ -n "${K_KERNEL_PATCH_HOTFIXES}" ]; then
 	UNIPATCH_LIST="${K_KERNEL_PATCH_HOTFIXES} ${UNIPATCH_LIST}"
 fi
 
-# ebuild default values setup settings
-KV_FULL="${PV}-${K_SABKERNEL_NAME}"
+# replace "linux" with K_SABKERNEL_NAME, usually replaces
+# "linux" with "sabayon" or "server" or "openvz"
+KV_FULL="${KV_FULL/${PN/-*}/${K_SABKERNEL_NAME}}"
+EXTRAVERSION="${EXTRAVERSION/${PN/-*}/${K_SABKERNEL_NAME}}"
+# drop -rX if exists
+[[ -n "${PR//r0}" ]] && [[ "${K_KERNEL_DISABLE_PR_EXTRAVERSION}" = "1" ]] && \
+	EXTRAVERSION="${EXTRAVERSION/-r*}" && KV_FULL="${KV_FULL/-r*}" && \
+	KV="${KV/-r*}"
 KV_OUT_DIR="/usr/src/linux-${KV_FULL}"
 S="${WORKDIR}/linux-${KV_FULL}"
+
+
 if [ -n "${K_FIRMWARE_PACKAGE}" ]; then
 	SLOT="0"
+elif [ "${K_KERNEL_SLOT_USEPVR}" = "1" ]; then
+	SLOT="${PVR}"
 else
 	SLOT="${PV}"
 fi
-EXTRAVERSION="-${K_SABKERNEL_NAME}"
 
 # provide extra virtual pkg
 if [ -z "${K_FIRMWARE_PACKAGE}" ]; then
@@ -307,8 +318,17 @@ _kernel_src_install() {
 	doins "${WORKDIR}"/boot/*
 	cp -Rp "${WORKDIR}"/lib/* "${D}/"
 
-	dosym "../../..${KV_OUT_DIR}" "/lib/modules/${KV_FULL}/source" || die "cannot install source symlink"
-	dosym "../../..${KV_OUT_DIR}" "/lib/modules/${KV_FULL}/build" || die "cannot install build symlink"
+	# This doesn't always work because KV_FULL (when K_NOSETEXTRAVERSION=1) doesn't
+	# reflect the real value used in Makefile
+	#dosym "../../..${KV_OUT_DIR}" "/lib/modules/${KV_FULL}/source" || die "cannot install source symlink"
+	#dosym "../../..${KV_OUT_DIR}" "/lib/modules/${KV_FULL}/build" || die "cannot install build symlink"
+	cd "${D}"/lib/modules/* || die "cannot enter /lib/modules directory, more than one element?"
+	# cleanup previous
+	rm -f build source || die
+	# create sane symlinks
+	ln -sf "../../..${KV_OUT_DIR}" source || die "cannot create source symlink"
+	ln -sf "../../..${KV_OUT_DIR}" build || die "cannot create build symlink"
+	cd "${S}"
 
 	# drop ${D}/lib/firmware, virtual/linux-firmwares provides it
 	rm -rf "${D}/lib/firmware"
diff --git a/sys-kernel/linux-openvz/Manifest b/sys-kernel/linux-openvz/Manifest
index 31bf89f23..4fec2d5fd 100644
--- a/sys-kernel/linux-openvz/Manifest
+++ b/sys-kernel/linux-openvz/Manifest
@@ -16,5 +16,5 @@ DIST linux-2.6.32.tar.bz2 64424138 RMD160 b93742cbaf8174f2200d2dbef0d47a26c61803
 DIST openvz-2.6.27-2.6.27.53.patch.bz2 34532 RMD160 82cf5116bd2b41f47485d0d9aa5cffd327fb8921 SHA1 f791c5e099d75c263e163c8377c5a40ddf78ec53 SHA256 e540bc3df99454f6cef110e9e6758e6994ed4e94d3b0fca5727ecba5406153f7
 DIST patch-dobrovolskiy.1-combined.gz 1216953 RMD160 94eb0e5db61c6c96304da03846ece90777799d13 SHA1 c61743f8f579f064d9bbf484f9b915c155e8f9c9 SHA256 4e78d1325e681acfbe1de6ab213a2cfb61544b1675e90dd53bb338e1a7c044d9
 DIST patch-kuindzhi.1-combined.gz 1104589 RMD160 bca276d3ee8ef77a985bdbbeef118e23194512fa SHA1 c64bc9d48c83edcaadb334be13bad6014fdd6e47 SHA256 afd96addcec3b51ce00e6239073c964ba9dffb5d5cb58a41baa14882893a9e83
-EBUILD linux-openvz-2.6.27.6.1-r1.ebuild 2841 RMD160 59c6dcf2e9d5028dccfd0d11bae4fe23de8484eb SHA1 916d03978e576dfa3c897a53728c93d95cdabd00 SHA256 9448045710b7edcffa51aa98519730ba268cf37eafc48dec6c324cee2b9da1ec
-EBUILD linux-openvz-2.6.32.8.1.ebuild 2620 RMD160 e23c8f76ec932143b64d4f0e2dcc959c26b211e7 SHA1 94cfacc9235c4e8d68eede9f81c814bc10493930 SHA256 66f49c64b62c90af0f71195a62518839de753bbbac109fb1f6080e9b6c9a8e8a
+EBUILD linux-openvz-2.6.27.6.1-r1.ebuild 2838 RMD160 f67d604bf01013c54d069cff733d1b932ac687c4 SHA1 896b962bb9a5b6b5382d40967c0701bc0cde68e4 SHA256 771f00518c65e4a5bdf399d2aab06d0da7e0f4c7f9c74cf41bb5e1554f3adecb
+EBUILD linux-openvz-2.6.32.8.1.ebuild 2578 RMD160 7955d0d38119ddd9a647232f584da9590f04e9fd SHA1 5596a8bec813fae6cf4ce6503d19dffccae16413 SHA256 7b3acd12ef66b173b966134318f14ed5aa953f257c7cbeb948a9e8385192dd2a
diff --git a/sys-kernel/linux-openvz/linux-openvz-2.6.27.6.1-r1.ebuild b/sys-kernel/linux-openvz/linux-openvz-2.6.27.6.1-r1.ebuild
index 8cbb39d90..6c06d93c5 100644
--- a/sys-kernel/linux-openvz/linux-openvz-2.6.27.6.1-r1.ebuild
+++ b/sys-kernel/linux-openvz/linux-openvz-2.6.27.6.1-r1.ebuild
@@ -33,12 +33,12 @@ KV_PATCH=$(get_version_component_range 3 ${OKV})
 
 KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
 
-K_SABKERNEL_NAME="openvz"
 K_KERNEL_SOURCES_PKG="sys-kernel/openvz-sources-${PVR}"
 # Security patches for CVE-2010-3081, will be merged in next stable kernel release
 K_KERNEL_PATCH_HOTFIXES="${FILESDIR}/hotfixes/2.6.27/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch
         ${FILESDIR}/hotfixes/2.6.27/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch
         ${FILESDIR}/hotfixes/2.6.27/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch"
+# match openvz-sources
 K_KERNEL_DISABLE_PR_EXTRAVERSION="0"
 inherit sabayon-kernel
 
diff --git a/sys-kernel/linux-openvz/linux-openvz-2.6.32.8.1.ebuild b/sys-kernel/linux-openvz/linux-openvz-2.6.32.8.1.ebuild
index 0265f79d7..a38122441 100644
--- a/sys-kernel/linux-openvz/linux-openvz-2.6.32.8.1.ebuild
+++ b/sys-kernel/linux-openvz/linux-openvz-2.6.32.8.1.ebuild
@@ -31,7 +31,6 @@ KV_PATCH=$(get_version_component_range 3 ${OKV})
 
 KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
 
-K_SABKERNEL_NAME="openvz"
 K_KERNEL_SOURCES_PKG="sys-kernel/openvz-sources-${PVR}"
 # Security patches for CVE-2010-3081, will be merged in next stable kernel release
 K_KERNEL_PATCH_HOTFIXES="${FILESDIR}/hotfixes/2.6.32/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch
@@ -39,7 +38,6 @@ K_KERNEL_PATCH_HOTFIXES="${FILESDIR}/hotfixes/2.6.32/x86-64-compat-test-rax-for-
         ${FILESDIR}/hotfixes/2.6.32/compat-make-compat_alloc_user_space-incorporate-the-access_ok.patch"
 K_KERNEL_DISABLE_PR_EXTRAVERSION="0"
 inherit sabayon-kernel
-echo $K_NOUSEPR
 
 SLOT=${CKV}-${OVZ_KV}
 if [[ ${PR} != r0 ]]; then
diff --git a/sys-kernel/linux-sabayon/Manifest b/sys-kernel/linux-sabayon/Manifest
index dd28e0cb5..ef000de91 100644
--- a/sys-kernel/linux-sabayon/Manifest
+++ b/sys-kernel/linux-sabayon/Manifest
@@ -24,7 +24,7 @@ DIST sabayon-2.6.35-r5-amd64.config 116173 RMD160 92791e5a35b24af194c42028efad20
 DIST sabayon-2.6.35-r5-x86.config 121509 RMD160 8a4410bf1127fc92626993daaeada9dd98a5e868 SHA1 ecb676d13bc8e39ba7b30d2573dfca76b5a50555 SHA256 d3623c92fadae87ddfa88062f3b6758865a374079aaed9081076dc7743f12664
 DIST sabayon-2.6.35-r6-amd64.config 116173 RMD160 92791e5a35b24af194c42028efad2093d5041b5b SHA1 d9ccc66b5b844e6dca922a2920a98fefc632a891 SHA256 580bf67b069038fcccf250500ae4bc2df212f194491983a0dc2302f66df6f0fa
 DIST sabayon-2.6.35-r6-x86.config 121509 RMD160 8a4410bf1127fc92626993daaeada9dd98a5e868 SHA1 ecb676d13bc8e39ba7b30d2573dfca76b5a50555 SHA256 d3623c92fadae87ddfa88062f3b6758865a374079aaed9081076dc7743f12664
-EBUILD linux-sabayon-2.6.33.ebuild 696 RMD160 190bc9ba3fa7ff0686cc942497837130cfa3476b SHA1 534964ce2df38fc7b716049389484f5bfc616adb SHA256 cfbf9d5eed2ded7d751d6cff2d7a0520cb2b5ce625ca722dc090be03882f7da5
-EBUILD linux-sabayon-2.6.34.ebuild 735 RMD160 d873fc0f7d5e053bddebe89510f405551bb50fa6 SHA1 1958203d14e6c0c3ea01061bff09a9f4f570366e SHA256 08087a5c0944957aa3b97209a786a490bf548a85997d456e0cc4b7ba3850cf0e
-EBUILD linux-sabayon-2.6.35-r5.ebuild 722 RMD160 ace68d14a027f2ed968da82f8ceae74904efc7a4 SHA1 a61767322bc40dd9ae0b49e1bc93e0f0e42efe65 SHA256 46161cb61c31a78d15ae5af3e90cd388ad1e0ac42f8560a843a456dd867f385f
-EBUILD linux-sabayon-2.6.35-r6.ebuild 344 RMD160 c84d19ff302308c8a5b1f04912c4e16e5da20a31 SHA1 5cb5ca13c3feb9db826454dcbef681b1a596cedf SHA256 52e869c06a6d9ced86d7be347534e1fcd3dfb85c1315cae0230db68b631b4400
+EBUILD linux-sabayon-2.6.33.ebuild 669 RMD160 bf865a6d9083bbab7ef13e176a9f3f331d36e308 SHA1 6fd929e2011723b66e78f054d5e7462300f74a2c SHA256 d8a650ca734634d9e0863837cf6ab58f3f0f2beb5413a3b9cbfdd76d512bfeca
+EBUILD linux-sabayon-2.6.34.ebuild 708 RMD160 6e21485711ff21a13e0543f397de900ca636ab9a SHA1 41c2ec6ab32ac7e7aee1a0a36f46d820bdc5f1b4 SHA256 149b06c28c2cddf98f970f7e5f32f869ebef13db5d98a8261445eab97b0931f4
+EBUILD linux-sabayon-2.6.35-r5.ebuild 695 RMD160 a84c594e028d4dd62ca9dd70d085507b56625800 SHA1 b874f2f7c4c835732d200bd0b44a1a827090a7a2 SHA256 2591c64ef33ecb56e6750d1dd62a4cfaaf98d4fd5a8e7ef5ee3cb13ec028513c
+EBUILD linux-sabayon-2.6.35-r6.ebuild 317 RMD160 f584565eb079d9b4358408e763cd04b3df714e37 SHA1 e9381e84c64006052b3da43f421ca05e74db5882 SHA256 79f7870a9fef1145593326242d05099730406c1923e72de6c8100d1a43007917
diff --git a/sys-kernel/linux-sabayon/linux-sabayon-2.6.33.ebuild b/sys-kernel/linux-sabayon/linux-sabayon-2.6.33.ebuild
index 60e8c9ee0..551097a3e 100644
--- a/sys-kernel/linux-sabayon/linux-sabayon-2.6.33.ebuild
+++ b/sys-kernel/linux-sabayon/linux-sabayon-2.6.33.ebuild
@@ -3,7 +3,6 @@
 
 ETYPE="sources"
 K_SABPATCHES_VER="6"
-K_SABKERNEL_NAME="sabayon"
 # Security patches for CVE-2010-3081, will be merged in next stable kernel release
 K_KERNEL_PATCH_HOTFIXES="${FILESDIR}/hotfixes/2.6.33/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch
         ${FILESDIR}/hotfixes/2.6.33/x86-64-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch
diff --git a/sys-kernel/linux-sabayon/linux-sabayon-2.6.34.ebuild b/sys-kernel/linux-sabayon/linux-sabayon-2.6.34.ebuild
index 500e7ba4d..3faced488 100644
--- a/sys-kernel/linux-sabayon/linux-sabayon-2.6.34.ebuild
+++ b/sys-kernel/linux-sabayon/linux-sabayon-2.6.34.ebuild
@@ -4,7 +4,6 @@
 ETYPE="sources"
 K_SABPATCHES_VER="11"
 K_KERNEL_PATCH_VER="7"
-K_SABKERNEL_NAME="sabayon"
 K_SABKERNEL_URI_CONFIG="yes"
 # Security patches for CVE-2010-3081, will be merged in next stable kernel release
 K_KERNEL_PATCH_HOTFIXES="${FILESDIR}/hotfixes/2.6.34/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch
diff --git a/sys-kernel/linux-sabayon/linux-sabayon-2.6.35-r5.ebuild b/sys-kernel/linux-sabayon/linux-sabayon-2.6.35-r5.ebuild
index 1141da2e2..457e0fd4c 100644
--- a/sys-kernel/linux-sabayon/linux-sabayon-2.6.35-r5.ebuild
+++ b/sys-kernel/linux-sabayon/linux-sabayon-2.6.35-r5.ebuild
@@ -4,7 +4,6 @@
 ETYPE="sources"
 K_SABPATCHES_VER="9"
 K_KERNEL_PATCH_VER="4"
-K_SABKERNEL_NAME="sabayon"
 K_SABKERNEL_URI_CONFIG="yes"
 # Security patches for CVE-2010-3081, will be merged in next stable kernel release
 K_KERNEL_PATCH_HOTFIXES="${FILESDIR}/hotfixes/2.6.35/linux-2.6.git-c41d68a513c71e35a14f66d71782d27a79a81ea6.patch
diff --git a/sys-kernel/linux-sabayon/linux-sabayon-2.6.35-r6.ebuild b/sys-kernel/linux-sabayon/linux-sabayon-2.6.35-r6.ebuild
index cd86febb3..ece97d3e2 100644
--- a/sys-kernel/linux-sabayon/linux-sabayon-2.6.35-r6.ebuild
+++ b/sys-kernel/linux-sabayon/linux-sabayon-2.6.35-r6.ebuild
@@ -4,7 +4,6 @@
 ETYPE="sources"
 K_SABPATCHES_VER="9"
 K_KERNEL_PATCH_VER="5"
-K_SABKERNEL_NAME="sabayon"
 K_SABKERNEL_URI_CONFIG="yes"
 inherit sabayon-kernel
 
diff --git a/sys-kernel/linux-server/Manifest b/sys-kernel/linux-server/Manifest
index c61cb68e2..a29a468ba 100644
--- a/sys-kernel/linux-server/Manifest
+++ b/sys-kernel/linux-server/Manifest
@@ -24,7 +24,7 @@ DIST server-2.6.35-r5-amd64.config 116649 RMD160 cdf6b7f80778b67422f863323bc2af2
 DIST server-2.6.35-r5-x86.config 121641 RMD160 ec930e27853aba07fec610e8d859d609a94201af SHA1 203d7191be89daffd7c829f84b9c5eed0a89e6b5 SHA256 a757eada636d38a845ccafbdc14a001cf79154d0f89e79efa880ea58b1131e3a
 DIST server-2.6.35-r6-amd64.config 116649 RMD160 cdf6b7f80778b67422f863323bc2af29b82dd993 SHA1 d40d3dca7c11d914cd1cd87ba4b7913aea002acf SHA256 cdf88908389dcdcf5a7550b7f06110d6f588612ad356b1d560e9d0cf609eaa92
 DIST server-2.6.35-r6-x86.config 121641 RMD160 ec930e27853aba07fec610e8d859d609a94201af SHA1 203d7191be89daffd7c829f84b9c5eed0a89e6b5 SHA256 a757eada636d38a845ccafbdc14a001cf79154d0f89e79efa880ea58b1131e3a
-EBUILD linux-server-2.6.33.ebuild 755 RMD160 e10465e9e95eec143b7ae899c5e81466154dc1a0 SHA1 89d8cd91600d0737f3069c83da18e5cf098c84f8 SHA256 5a36140ee78dc056531bee266dcb0c0ae8ceca85d000be5af293290f4c02a62a
-EBUILD linux-server-2.6.34.ebuild 808 RMD160 2d035968b1ef954b20ab232e86bb8b7960143259 SHA1 ae10a5213627aa743937ec5644605eb8a9f083f9 SHA256 6dd415d7eba20c50f911db2a450e2af77a8b0e45939803f1a24f858b416ac407
-EBUILD linux-server-2.6.35-r5.ebuild 794 RMD160 39b9f4492da9bdf3ed8805023773d29e19c64ce2 SHA1 8c39d7ee789fc8ac6bc8ba8a307822a714943893 SHA256 503a71251019d9ad23936ce4863c8ac9be3fc24375be8902ee0a38754fcd706f
-EBUILD linux-server-2.6.35-r6.ebuild 402 RMD160 a9c0f7fb36788bd13e43fc183e926b7c171d56bf SHA1 857b80f2f577a2770525d692a99ab51df0518899 SHA256 53cb6e02f9b63eff47fe44093071fd6b945807c53e0cccc14b2ce5c89e3cc32f
+EBUILD linux-server-2.6.33.ebuild 729 RMD160 81df987369b3029448fb1b9ee276536d34c0b308 SHA1 0a25774bcae8fc5aff5313c51cd69f11531f72fd SHA256 cf82d8ebd82b0ca12e2cfdbefd5d7a5a43782ba7897cbae83dbf77e20f8499ae
+EBUILD linux-server-2.6.34.ebuild 782 RMD160 5087c1b1d85cae909f1d9bdbe47de88a2fe4377e SHA1 20fb922ce477eeca14f2fec688f2a65fdef893f8 SHA256 c70a3e046fef0b06f50da8f1dc8d0c4ad6ca16a669fa7eba8a8b6e1cc3084f2d
+EBUILD linux-server-2.6.35-r5.ebuild 768 RMD160 242286ece09fe24dd5a4ee4c9f4720aded7e349c SHA1 ce299681c79a8c984c0ba0df6dd429d760edbe0c SHA256 50ff86f212e7a8e928c453067934ef071500bc62a4adea7e25c5fd23a3d4d999
+EBUILD linux-server-2.6.35-r6.ebuild 376 RMD160 db2c64dc68c459fd8db06126a6d8e2b0659cd111 SHA1 9de6ccd9c3f21bf996588f6fa74324701e8ce723 SHA256 22c7adb4e1c31ec128073cbe7fd9b52e5f30f216f4bce37a5609bc614e33ce5d
diff --git a/sys-kernel/linux-server/linux-server-2.6.33.ebuild b/sys-kernel/linux-server/linux-server-2.6.33.ebuild
index a41fbe92d..54b54db4d 100644
--- a/sys-kernel/linux-server/linux-server-2.6.33.ebuild
+++ b/sys-kernel/linux-server/linux-server-2.6.33.ebuild
@@ -3,7 +3,6 @@
 
 ETYPE="sources"
 K_SABPATCHES_VER="6"
-K_SABKERNEL_NAME="server"
 K_KERNEL_SOURCES_PKG="sys-kernel/linux-server-sources-${PVR}"
 # Security patches for CVE-2010-3081, will be merged in next stable kernel release
 K_KERNEL_PATCH_HOTFIXES="${FILESDIR}/hotfixes/2.6.33/x86-64-compat-test-rax-for-the-syscall-number-not-eax.patch
diff --git a/sys-kernel/linux-server/linux-server-2.6.34.ebuild b/sys-kernel/linux-server/linux-server-2.6.34.ebuild
index 6e46e7f10..8441bf8ab 100644
--- a/sys-kernel/linux-server/linux-server-2.6.34.ebuild
+++ b/sys-kernel/linux-server/linux-server-2.6.34.ebuild
@@ -4,7 +4,6 @@
 ETYPE="sources"
 K_SABPATCHES_VER="11"
 K_KERNEL_PATCH_VER="6"
-K_SABKERNEL_NAME="server"
 K_KERNEL_SOURCES_PKG="sys-kernel/linux-server-sources-${PVR}"
 K_SABKERNEL_URI_CONFIG="yes"
 # Security patches for CVE-2010-3081, will be merged in next stable kernel release
diff --git a/sys-kernel/linux-server/linux-server-2.6.35-r5.ebuild b/sys-kernel/linux-server/linux-server-2.6.35-r5.ebuild
index 2a5b4f0e1..1d2c1a8e5 100644
--- a/sys-kernel/linux-server/linux-server-2.6.35-r5.ebuild
+++ b/sys-kernel/linux-server/linux-server-2.6.35-r5.ebuild
@@ -4,7 +4,6 @@
 ETYPE="sources"
 K_SABPATCHES_VER="9"
 K_KERNEL_PATCH_VER="4"
-K_SABKERNEL_NAME="server"
 K_KERNEL_SOURCES_PKG="sys-kernel/linux-server-sources-${PVR}"
 K_SABKERNEL_URI_CONFIG="yes"
 # Security patches for CVE-2010-3081, will be merged in next stable kernel release
diff --git a/sys-kernel/linux-server/linux-server-2.6.35-r6.ebuild b/sys-kernel/linux-server/linux-server-2.6.35-r6.ebuild
index b9078b429..7aa238dae 100644
--- a/sys-kernel/linux-server/linux-server-2.6.35-r6.ebuild
+++ b/sys-kernel/linux-server/linux-server-2.6.35-r6.ebuild
@@ -4,7 +4,6 @@
 ETYPE="sources"
 K_SABPATCHES_VER="9"
 K_KERNEL_PATCH_VER="5"
-K_SABKERNEL_NAME="server"
 K_KERNEL_SOURCES_PKG="sys-kernel/linux-server-sources-${PVR}"
 K_SABKERNEL_URI_CONFIG="yes"
 inherit sabayon-kernel
diff --git a/sys-kernel/linux-vserver/Manifest b/sys-kernel/linux-vserver/Manifest
index 7856121b5..614b48df0 100644
--- a/sys-kernel/linux-vserver/Manifest
+++ b/sys-kernel/linux-vserver/Manifest
@@ -7,4 +7,4 @@ DIST genpatches-2.6.35-4.base.tar.bz2 46490 RMD160 59e43f5fc125252d07af500ecc204
 DIST genpatches-2.6.35-4.extras.tar.bz2 15486 RMD160 bb61e34c295a5d562f78fe2ac0bc023c9badec2f SHA1 c832349cde052e368cb5ff8c8df296b7a05bd405 SHA256 9291df1cc0f48dba21fff9d5da59c7403ea29269561fca3c0e58658455f208de
 DIST linux-2.6.35.tar.bz2 69305709 RMD160 f5d91abb4fa72fac812578d830b22180d85a0e6f SHA1 4cb1fbfbeedcd658ca37739679c65dfaa136bf4e SHA256 18b2e2c336032e366c942622b77302cb05fc034fb19018f086a4ebc9ed41bfcf
 DIST vserver-patches-2.6.35_2.3.0.36.31.tar.bz2 148472 RMD160 1b772430ec7d7e34e52b477cf8563287d3b3b7ac SHA1 35cbbb2fe9e3058e2fa7a8bd6ddc2fd028fbadab SHA256 e874173800f3a3923c2770164842e77d6eb5efcdb377278baa2a2f602ddbc2f1
-EBUILD linux-vserver-2.3.0.36.31.ebuild 1603 RMD160 66b91a6bd88f858d0ab11a563ff7138cdb811ec3 SHA1 e59c426e8d48a1c2d5f1976150a82d406fe99e10 SHA256 940e0e4ca209d6d51f38c9bedc499eaaa48012784df1bd870e62755ae15c7b9f
+EBUILD linux-vserver-2.3.0.36.31.ebuild 1834 RMD160 6f60df416a39cee193c3e4e88336663691765850 SHA1 681c5c14b4348cef8aabc483acf0baba6662e0f8 SHA256 06461754ea091435e9555a77838564dbe9934825242daa48baeb50ed57cbea50
diff --git a/sys-kernel/linux-vserver/linux-vserver-2.3.0.36.31.ebuild b/sys-kernel/linux-vserver/linux-vserver-2.3.0.36.31.ebuild
index 7db71a033..84a95b22d 100644
--- a/sys-kernel/linux-vserver/linux-vserver-2.3.0.36.31.ebuild
+++ b/sys-kernel/linux-vserver/linux-vserver-2.3.0.36.31.ebuild
@@ -14,13 +14,17 @@ K_NOSETEXTRAVERSION="1"
 UNIPATCH_STRICTORDER="1"
 K_WANT_GENPATCHES="base extras"
 K_GENPATCHES_VER="4"
-K_SABKERNEL_NAME="vserver"
 K_KERNEL_SOURCES_PKG="sys-kernel/vserver-sources-${PVR}"
 # Security patches for CVE-2010-3081, will be merged in next stable kernel release
 K_KERNEL_PATCH_HOTFIXES="${FILESDIR}/hotfixes/2.6.35/linux-2.6.git-c41d68a513c71e35a14f66d71782d27a79a81ea6.patch
         ${FILESDIR}/hotfixes/2.6.35/linux-2.6.git-eefdca043e8391dcd719711716492063030b55ac.patch
         ${FILESDIR}/hotfixes/2.6.35/linux-2.6.git-36d001c70d8a0144ac1d038f6876c484849a74de.patch"
+# match vserver-sources
 K_KERNEL_DISABLE_PR_EXTRAVERSION="0"
+K_KERNEL_SLOT_USEPVR="1"
+# PLEASE NOTE: grub-handler is known to not work with kernel binary+initramfs installed
+# by this package, but grub-0.9x support is going to be dropped and there are no
+# releases shipped with it as of today.
 inherit sabayon-kernel
 
 ############################################