diff --git a/sys-kernel/linux-sabayon/Manifest b/sys-kernel/linux-sabayon/Manifest
index d226abc37..13eba5264 100644
--- a/sys-kernel/linux-sabayon/Manifest
+++ b/sys-kernel/linux-sabayon/Manifest
@@ -22,7 +22,7 @@ DIST linux-2.6.39-r10+sabayon.tar.bz2 76477452 RMD160 a881c960284fc1528b5d162e42
 DIST linux-2.6.39-r8+sabayon.tar.bz2 76483459 RMD160 dd168257b37d9a96c10d22303ff101e01127b00a SHA1 bb2024dbaebc141a6d5990e7d53bd626f5dd9a60 SHA256 46983252a0af4aeb275b45b0dd0ca82e2b6fb807dbf6b94a824dc962b81ebf86
 DIST linux-2.6.39-r9+sabayon.tar.bz2 76486101 RMD160 e3b3f5dc1676bfda920ef38203bbd23c163a2818 SHA1 6cc8cd67aa246a7149dca014153091cf32dbb077 SHA256 48d8f864b5be3ac6e7f3f4f63d485898fd9d043d484916114d14ded8011cdfcf
 DIST linux-2.6.39.tar.bz2 76096559 RMD160 feddc516bc15e78f12f611ff184d38baa4eac4ee SHA1 68518112821e55f4ac1df64f2e0e809cedfcc5ef SHA256 584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6
-DIST linux-3.0-r5+sabayon.tar.bz2 77172747 RMD160 c9027b2139ae1798dccc2978d3c0f8d254f7344f SHA1 3f5d0eff30fee66b3b255874049e8a50b798303f SHA256 f886124e28f96ac08005481b162c16aab0175962557dddf0af2c0b96ca225bf4
+DIST linux-3.0-r6+sabayon.tar.bz2 77183954 RMD160 681f864a942cda0be4ba322e30cb033b2bfe016e SHA1 90345e94ce7e6dd5fcd1ee82ca4971b1dc7bb9ea SHA256 9535c30ca242b9df9f3b22be7f5d1fc55c357e548482e7eb4aba774f3fc733c0
 DIST patch-2.6.37.2.bz2 109460 RMD160 b97f329195d90638adab13525b42a3e10a44fd0a SHA1 9d006788614ce463f3693073a92b0c8b482af6b0 SHA256 3d65f2fb5f0018e8dafda4abe68d947d2ab5e21c386062cb0d6e011244a16aef
 DIST patch-2.6.37.3.bz2 132880 RMD160 1116504c7ea4a46053fe3a6f7dcd0a82581f9dfc SHA1 7c3d3ded2117b2602275e070d7d0a5c7ad65e7ce SHA256 af6ccb6c85db09e78a85657b1013b2aa1399ef252ce552aafcf25684e6e5ad98
 DIST patch-2.6.38.6.bz2 128175 RMD160 fcafa6e7420139bded0123ffcc21ccda8709c839 SHA1 cc69f739eb5a64a11b11256b7e69139a28fb0777 SHA256 e5bafef2af12fbf47cd8bce3d65b3e10a3dff328be5d589a90a2de0d0b822fd4
@@ -59,4 +59,4 @@ EBUILD linux-sabayon-2.6.39-r10.ebuild 325 RMD160 eed8f7d9c6ee91e302d637980a30d6
 EBUILD linux-sabayon-2.6.39-r8.ebuild 325 RMD160 eed8f7d9c6ee91e302d637980a30d660ed92d609 SHA1 4d1b74f1974678599a65b90978d9b81f5610f3be SHA256 651f0899dc9ee5226266bb26cd0bc31ccc4c6618ff5d00a029b65acf03b45c07
 EBUILD linux-sabayon-2.6.39-r9.ebuild 325 RMD160 eed8f7d9c6ee91e302d637980a30d660ed92d609 SHA1 4d1b74f1974678599a65b90978d9b81f5610f3be SHA256 651f0899dc9ee5226266bb26cd0bc31ccc4c6618ff5d00a029b65acf03b45c07
 EBUILD linux-sabayon-2.6.39.ebuild 316 RMD160 fabf427f0e1c4cf5ab663d804e932e1e8939a7de SHA1 10e1e59de54798f4ab2d0974ddc231b9b7f4584d SHA256 0e1bf7afa47a2ba140b7ab3259b8017cb71805d0131658e5f5f57d14d542dedd
-EBUILD linux-sabayon-3.0-r5.ebuild 356 RMD160 d80225ac2aac310e89de10a30306ef223d8f52c8 SHA1 42ea909558ad3cdc0a5da2c110b09ae1217b4a88 SHA256 e94604a054f1186560c6ab4956d9299c03602e246bbec1c5a4a0861632b62191
+EBUILD linux-sabayon-3.0-r6.ebuild 356 RMD160 d80225ac2aac310e89de10a30306ef223d8f52c8 SHA1 42ea909558ad3cdc0a5da2c110b09ae1217b4a88 SHA256 e94604a054f1186560c6ab4956d9299c03602e246bbec1c5a4a0861632b62191
diff --git a/sys-kernel/linux-sabayon/linux-sabayon-3.0-r5.ebuild b/sys-kernel/linux-sabayon/linux-sabayon-3.0-r6.ebuild
similarity index 100%
rename from sys-kernel/linux-sabayon/linux-sabayon-3.0-r5.ebuild
rename to sys-kernel/linux-sabayon/linux-sabayon-3.0-r6.ebuild
diff --git a/sys-kernel/linux-server/Manifest b/sys-kernel/linux-server/Manifest
index 7e5264a61..5cc9089e3 100644
--- a/sys-kernel/linux-server/Manifest
+++ b/sys-kernel/linux-server/Manifest
@@ -15,7 +15,7 @@ DIST linux-2.6.39-r10+sabayon.tar.bz2 76477452 RMD160 a881c960284fc1528b5d162e42
 DIST linux-2.6.39-r8+sabayon.tar.bz2 76483459 RMD160 dd168257b37d9a96c10d22303ff101e01127b00a SHA1 bb2024dbaebc141a6d5990e7d53bd626f5dd9a60 SHA256 46983252a0af4aeb275b45b0dd0ca82e2b6fb807dbf6b94a824dc962b81ebf86
 DIST linux-2.6.39-r9+sabayon.tar.bz2 76486101 RMD160 e3b3f5dc1676bfda920ef38203bbd23c163a2818 SHA1 6cc8cd67aa246a7149dca014153091cf32dbb077 SHA256 48d8f864b5be3ac6e7f3f4f63d485898fd9d043d484916114d14ded8011cdfcf
 DIST linux-2.6.39.tar.bz2 76096559 RMD160 feddc516bc15e78f12f611ff184d38baa4eac4ee SHA1 68518112821e55f4ac1df64f2e0e809cedfcc5ef SHA256 584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6
-DIST linux-3.0-r5+sabayon.tar.bz2 77172747 RMD160 c9027b2139ae1798dccc2978d3c0f8d254f7344f SHA1 3f5d0eff30fee66b3b255874049e8a50b798303f SHA256 f886124e28f96ac08005481b162c16aab0175962557dddf0af2c0b96ca225bf4
+DIST linux-3.0-r6+sabayon.tar.bz2 77183954 RMD160 681f864a942cda0be4ba322e30cb033b2bfe016e SHA1 90345e94ce7e6dd5fcd1ee82ca4971b1dc7bb9ea SHA256 9535c30ca242b9df9f3b22be7f5d1fc55c357e548482e7eb4aba774f3fc733c0
 DIST patch-2.6.34.10.bz2 383665 RMD160 c68a391711333609a0c6000c27ec2445ff14c4aa SHA1 735f9d0f515762d2fe83872ce59d0c5affaadee1 SHA256 1a7ba6692a233934fc131349ccdf19c272306d3a0b3db01046c76c4e7996d567
 DIST patch-2.6.35.14.bz2 413380 RMD160 d1ea12b9f9f1ed516e71cacbc9fdc8986200ce9b SHA1 a0f88fdb23c174911c666524bbefc04fbe93553b SHA256 57c820dfb7a587c01a90d6317c9d7e2ae1471b923970ad305c384dbb1d67b182
 DIST patch-2.6.36.4.bz2 186814 RMD160 ed06acb39f2e272d388bb04810d0d9626c70fa55 SHA1 7c2cb8f0f7957af3fbc56cbf0a012465cf66c9ec SHA256 77186bff89a5ae7e289b33b7e721921fecd978a2df05b0e69bdafc1a9bfa30f2
@@ -45,4 +45,4 @@ EBUILD linux-server-2.6.39-r10.ebuild 378 RMD160 dd09bc0a1c98b3fe49a6d459a632ce6
 EBUILD linux-server-2.6.39-r8.ebuild 378 RMD160 dd09bc0a1c98b3fe49a6d459a632ce67cab0b167 SHA1 9fd59a165f3d407e65b24b2e55182826a767231a SHA256 5d02db1577b52fcd4e35b955e3a262a5ec704cde33ee98fd15658183ddccbb07
 EBUILD linux-server-2.6.39-r9.ebuild 378 RMD160 dd09bc0a1c98b3fe49a6d459a632ce67cab0b167 SHA1 9fd59a165f3d407e65b24b2e55182826a767231a SHA256 5d02db1577b52fcd4e35b955e3a262a5ec704cde33ee98fd15658183ddccbb07
 EBUILD linux-server-2.6.39.ebuild 369 RMD160 f9d74d7116613cf4405c90817af59b9a6adf064d SHA1 c5973803e1ca8e2fe35bcd0c8f45aa87117503a6 SHA256 6bb9121fb932842fc747a72b2e8faa82c07e5d7f2e77f7495f004005a57b5887
-EBUILD linux-server-3.0-r5.ebuild 409 RMD160 b53ebbfbef224e208570648919a459ef4da74487 SHA1 1f4ec0ea633fa8c082763a6be477275e5a26581c SHA256 b8de7cecf5a4b13325150934b128a3c07cd04d166c945ae2468017416484b935
+EBUILD linux-server-3.0-r6.ebuild 409 RMD160 b53ebbfbef224e208570648919a459ef4da74487 SHA1 1f4ec0ea633fa8c082763a6be477275e5a26581c SHA256 b8de7cecf5a4b13325150934b128a3c07cd04d166c945ae2468017416484b935
diff --git a/sys-kernel/linux-server/linux-server-3.0-r5.ebuild b/sys-kernel/linux-server/linux-server-3.0-r6.ebuild
similarity index 100%
rename from sys-kernel/linux-server/linux-server-3.0-r5.ebuild
rename to sys-kernel/linux-server/linux-server-3.0-r6.ebuild
diff --git a/sys-kernel/sabayon-sources/Manifest b/sys-kernel/sabayon-sources/Manifest
index 842355f3a..926ea856a 100644
--- a/sys-kernel/sabayon-sources/Manifest
+++ b/sys-kernel/sabayon-sources/Manifest
@@ -28,7 +28,7 @@ DIST linux-2.6.39-r10+sabayon.tar.bz2 76477452 RMD160 a881c960284fc1528b5d162e42
 DIST linux-2.6.39-r8+sabayon.tar.bz2 76483459 RMD160 dd168257b37d9a96c10d22303ff101e01127b00a SHA1 bb2024dbaebc141a6d5990e7d53bd626f5dd9a60 SHA256 46983252a0af4aeb275b45b0dd0ca82e2b6fb807dbf6b94a824dc962b81ebf86
 DIST linux-2.6.39-r9+sabayon.tar.bz2 76486101 RMD160 e3b3f5dc1676bfda920ef38203bbd23c163a2818 SHA1 6cc8cd67aa246a7149dca014153091cf32dbb077 SHA256 48d8f864b5be3ac6e7f3f4f63d485898fd9d043d484916114d14ded8011cdfcf
 DIST linux-2.6.39.tar.bz2 76096559 RMD160 feddc516bc15e78f12f611ff184d38baa4eac4ee SHA1 68518112821e55f4ac1df64f2e0e809cedfcc5ef SHA256 584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6
-DIST linux-3.0-r5+sabayon.tar.bz2 77172747 RMD160 c9027b2139ae1798dccc2978d3c0f8d254f7344f SHA1 3f5d0eff30fee66b3b255874049e8a50b798303f SHA256 f886124e28f96ac08005481b162c16aab0175962557dddf0af2c0b96ca225bf4
+DIST linux-3.0-r6+sabayon.tar.bz2 77183954 RMD160 681f864a942cda0be4ba322e30cb033b2bfe016e SHA1 90345e94ce7e6dd5fcd1ee82ca4971b1dc7bb9ea SHA256 9535c30ca242b9df9f3b22be7f5d1fc55c357e548482e7eb4aba774f3fc733c0
 DIST patch-2.6.34.7.bz2 184957 RMD160 0f72e9496ff0082df05424ec75aff166ba6dff27 SHA1 b346d804a428239145b6c058ff0df88792c31094 SHA256 b146904ea07cc87a3fbcbd4eab51d331d56718431539e6aa29c24b072e6b7832
 DIST patch-2.6.35.4.bz2 75980 RMD160 d3d050d516f6283b17d2e15075d57d6c41235254 SHA1 f17d865d5a8320d79869223049ebc36296a1dedd SHA256 03f88e20d9138fd710b338403b2fc97e43ecc34b1f6f0b0d203e03307485550e
 DIST patch-2.6.35.5.bz2 115391 RMD160 8a6d0b71aa043531575203aa61ac6807532f35e8 SHA1 1267c980179fe4ab35ac7344523c4dd616d2d5a6 SHA256 94bbeb43c6bd8047fa5f42766a68879199dfdadee11bd3e8f10f1317f698b0f4
@@ -78,4 +78,4 @@ EBUILD sabayon-sources-2.6.39-r10.ebuild 525 RMD160 756178546ce51e110751cf8260ab
 EBUILD sabayon-sources-2.6.39-r8.ebuild 525 RMD160 756178546ce51e110751cf8260ab30f8040d74f4 SHA1 f5a64c87dd3311250159325c9dd3a5f57fc8fdf7 SHA256 070887756b14c524c17c0b660810187fb3ad4581aa6b8baa69d6c847d9826de9
 EBUILD sabayon-sources-2.6.39-r9.ebuild 525 RMD160 756178546ce51e110751cf8260ab30f8040d74f4 SHA1 f5a64c87dd3311250159325c9dd3a5f57fc8fdf7 SHA256 070887756b14c524c17c0b660810187fb3ad4581aa6b8baa69d6c847d9826de9
 EBUILD sabayon-sources-2.6.39.ebuild 569 RMD160 b0aa9b0e422fa94c13ad25bd15cb7d7e3202a0fd SHA1 5c0cfc835b73595600a352dfcdd7173ca4c0e18c SHA256 71b9b08cab2db74aeca4d50fad18d40b75de6d7cd6d1f5eba6c96073241de5fc
-EBUILD sabayon-sources-3.0-r5.ebuild 556 RMD160 f5e82498df737f94fd0ee6dc4d719f0d333aae9c SHA1 d3ed4c24f8b820840b4caaba92b8bf9ca91de4a1 SHA256 7ce9a2e2f5165a08bb2276be9b653144d58114fb77dc5bc43c6bbc112cca2462
+EBUILD sabayon-sources-3.0-r6.ebuild 556 RMD160 f5e82498df737f94fd0ee6dc4d719f0d333aae9c SHA1 d3ed4c24f8b820840b4caaba92b8bf9ca91de4a1 SHA256 7ce9a2e2f5165a08bb2276be9b653144d58114fb77dc5bc43c6bbc112cca2462
diff --git a/sys-kernel/sabayon-sources/sabayon-sources-3.0-r5.ebuild b/sys-kernel/sabayon-sources/sabayon-sources-3.0-r6.ebuild
similarity index 100%
rename from sys-kernel/sabayon-sources/sabayon-sources-3.0-r5.ebuild
rename to sys-kernel/sabayon-sources/sabayon-sources-3.0-r6.ebuild
diff --git a/sys-kernel/server-sources/Manifest b/sys-kernel/server-sources/Manifest
index 9ae0e9edc..c1f40a8c4 100644
--- a/sys-kernel/server-sources/Manifest
+++ b/sys-kernel/server-sources/Manifest
@@ -27,7 +27,7 @@ DIST linux-2.6.39-r10+sabayon.tar.bz2 76477452 RMD160 a881c960284fc1528b5d162e42
 DIST linux-2.6.39-r8+sabayon.tar.bz2 76483459 RMD160 dd168257b37d9a96c10d22303ff101e01127b00a SHA1 bb2024dbaebc141a6d5990e7d53bd626f5dd9a60 SHA256 46983252a0af4aeb275b45b0dd0ca82e2b6fb807dbf6b94a824dc962b81ebf86
 DIST linux-2.6.39-r9+sabayon.tar.bz2 76486101 RMD160 e3b3f5dc1676bfda920ef38203bbd23c163a2818 SHA1 6cc8cd67aa246a7149dca014153091cf32dbb077 SHA256 48d8f864b5be3ac6e7f3f4f63d485898fd9d043d484916114d14ded8011cdfcf
 DIST linux-2.6.39.tar.bz2 76096559 RMD160 feddc516bc15e78f12f611ff184d38baa4eac4ee SHA1 68518112821e55f4ac1df64f2e0e809cedfcc5ef SHA256 584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6
-DIST linux-3.0-r5+sabayon.tar.bz2 77172747 RMD160 c9027b2139ae1798dccc2978d3c0f8d254f7344f SHA1 3f5d0eff30fee66b3b255874049e8a50b798303f SHA256 f886124e28f96ac08005481b162c16aab0175962557dddf0af2c0b96ca225bf4
+DIST linux-3.0-r6+sabayon.tar.bz2 77183954 RMD160 681f864a942cda0be4ba322e30cb033b2bfe016e SHA1 90345e94ce7e6dd5fcd1ee82ca4971b1dc7bb9ea SHA256 9535c30ca242b9df9f3b22be7f5d1fc55c357e548482e7eb4aba774f3fc733c0
 DIST patch-2.6.34.6.bz2 185209 RMD160 75c9a569f8c80be7c418b75f7cde444fcc0a70ff SHA1 e033e2bc4b46e7cc8ee19c07b5ad6999b4c2a52d SHA256 a62e9392ad435948ea4ea2cce12e60e042da6e6da806691936ba50bbaa0dc8cc
 DIST patch-2.6.35.3.bz2 39766 RMD160 de90d8444497c1eaa222cf9df6e81f35a388423e SHA1 38717af633669750bc7e65508ae7253de3c5c527 SHA256 94d321099f20f47dc681304a630391322e0e4d6672bb1106a621e6347c44db83
 DIST patch-2.6.35.5.bz2 115391 RMD160 8a6d0b71aa043531575203aa61ac6807532f35e8 SHA1 1267c980179fe4ab35ac7344523c4dd616d2d5a6 SHA256 94bbeb43c6bd8047fa5f42766a68879199dfdadee11bd3e8f10f1317f698b0f4
@@ -71,4 +71,4 @@ EBUILD server-sources-2.6.39-r10.ebuild 490 RMD160 63d29825535c424ace56e50de8bb6
 EBUILD server-sources-2.6.39-r8.ebuild 490 RMD160 63d29825535c424ace56e50de8bb6c531571bfe7 SHA1 a97841209c63254d4fd471de6329b34367bfa23d SHA256 37b14639b6b7851e82c3d875e4f8cd856f8304dd2fd0d8d196bbdea38f79f83c
 EBUILD server-sources-2.6.39-r9.ebuild 490 RMD160 63d29825535c424ace56e50de8bb6c531571bfe7 SHA1 a97841209c63254d4fd471de6329b34367bfa23d SHA256 37b14639b6b7851e82c3d875e4f8cd856f8304dd2fd0d8d196bbdea38f79f83c
 EBUILD server-sources-2.6.39.ebuild 563 RMD160 293587a502c0654b6b946184e0e2c48681d9b434 SHA1 caa1a4b16d13c08abcfa152638a0138237533276 SHA256 d54ab5b701b512bff375ea8374d86fd0b5643142bdc758f89c0406504f21b00f
-EBUILD server-sources-3.0-r5.ebuild 521 RMD160 3424c57d79d778cb117c990e5557b4e240aa51cc SHA1 010647c35eab4fc2173287cddb8d32fd2da04468 SHA256 2774638173cc0d59fcb500249ba1cdbd413c0e343ac655f970145cb5b7469b36
+EBUILD server-sources-3.0-r6.ebuild 521 RMD160 3424c57d79d778cb117c990e5557b4e240aa51cc SHA1 010647c35eab4fc2173287cddb8d32fd2da04468 SHA256 2774638173cc0d59fcb500249ba1cdbd413c0e343ac655f970145cb5b7469b36
diff --git a/sys-kernel/server-sources/server-sources-3.0-r5.ebuild b/sys-kernel/server-sources/server-sources-3.0-r6.ebuild
similarity index 100%
rename from sys-kernel/server-sources/server-sources-3.0-r5.ebuild
rename to sys-kernel/server-sources/server-sources-3.0-r6.ebuild