diff --git a/sys-kernel/linux-sabayon/Manifest b/sys-kernel/linux-sabayon/Manifest
index f4976dd42..898c41957 100644
--- a/sys-kernel/linux-sabayon/Manifest
+++ b/sys-kernel/linux-sabayon/Manifest
@@ -24,7 +24,7 @@ DIST linux-2.6.35.tar.bz2 69305709 RMD160 f5d91abb4fa72fac812578d830b22180d85a0e
 DIST linux-2.6.36.tar.bz2 70277083 RMD160 d739da505a79e71a1370d36e1373b36be055c123 SHA1 b546ab66458d7d614151d80adbc03b4d28977ae2 SHA256 15a076d1a435a6bf8e92834eba4b390b4ec094ce06d47f89d071ca9e5788ce04
 DIST linux-2.6.37.tar.bz2 73577826 RMD160 fced3801f3c94aa545c90e10981de616376a3b41 SHA1 eba83c89e71a86060ef6ff76aefff660aef819e2 SHA256 edbf091805414739cf57a3bbfeba9e87f5e74f97e38f04d12060e9e0c71e383a
 DIST linux-2.6.38.tar.bz2 74739098 RMD160 d1179be93f1309303b9aa6008a25b6247726e764 SHA1 02aade5ad3dedd70739c9b4a05de40edbe432d25 SHA256 72f0cfaefb8dc86b219d5a742dd0375332627641ecbdf5badd3158e2127b9304
-DIST linux-2.6.39-r6+sabayon.tar.bz2 76481435 RMD160 38fa2e2fa4e202615c5ce57ad8ca62848b302c2e SHA1 d237c0a7ba2712870811a71ff256be2137086a59 SHA256 d1310f0f57eaf0dffc9d9a4e91c33e4c85bac7516c18c9acf9f524e10df4b7f6
+DIST linux-2.6.39-r7+sabayon.tar.bz2 76482200 RMD160 600a0cc83a378f7989a0084256b0d9c52b4ec656 SHA1 90ef4f9ae353a518ba613dee57f6ecdea1cb0f39 SHA256 44a48acbd53de4445ce0790ba73d1a6499ecc7ae2036dec7de543feb5b331764
 DIST linux-2.6.39.tar.bz2 76096559 RMD160 feddc516bc15e78f12f611ff184d38baa4eac4ee SHA1 68518112821e55f4ac1df64f2e0e809cedfcc5ef SHA256 584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6
 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
@@ -71,5 +71,5 @@ EBUILD linux-sabayon-2.6.38-r1.ebuild 316 RMD160 6622df546ced0f54f7eecea2b189853
 EBUILD linux-sabayon-2.6.38-r6.ebuild 317 RMD160 0b8b3e46c7603314b72d9995d0eb25200fe33391 SHA1 adfc0ef8d6eb7d3cca32591484709688f2f9e451 SHA256 fa057ba1c0df591f7a5b1d5f85d5bcfdbeaff67369c8e3149bd87dc718c6dda8
 EBUILD linux-sabayon-2.6.38.ebuild 316 RMD160 6622df546ced0f54f7eecea2b189853455d799e9 SHA1 d3ba47e0019289f7710a632b14721c45fa3522f3 SHA256 4ae68aa6a6d7780b289d3b43e018a134695e2495a8a9a68f8c0acfa38d859dec
 EBUILD linux-sabayon-2.6.39-r1.ebuild 316 RMD160 fabf427f0e1c4cf5ab663d804e932e1e8939a7de SHA1 10e1e59de54798f4ab2d0974ddc231b9b7f4584d SHA256 0e1bf7afa47a2ba140b7ab3259b8017cb71805d0131658e5f5f57d14d542dedd
-EBUILD linux-sabayon-2.6.39-r6.ebuild 325 RMD160 eed8f7d9c6ee91e302d637980a30d660ed92d609 SHA1 4d1b74f1974678599a65b90978d9b81f5610f3be SHA256 651f0899dc9ee5226266bb26cd0bc31ccc4c6618ff5d00a029b65acf03b45c07
+EBUILD linux-sabayon-2.6.39-r7.ebuild 325 RMD160 eed8f7d9c6ee91e302d637980a30d660ed92d609 SHA1 4d1b74f1974678599a65b90978d9b81f5610f3be SHA256 651f0899dc9ee5226266bb26cd0bc31ccc4c6618ff5d00a029b65acf03b45c07
 EBUILD linux-sabayon-2.6.39.ebuild 316 RMD160 fabf427f0e1c4cf5ab663d804e932e1e8939a7de SHA1 10e1e59de54798f4ab2d0974ddc231b9b7f4584d SHA256 0e1bf7afa47a2ba140b7ab3259b8017cb71805d0131658e5f5f57d14d542dedd
diff --git a/sys-kernel/linux-sabayon/linux-sabayon-2.6.39-r6.ebuild b/sys-kernel/linux-sabayon/linux-sabayon-2.6.39-r7.ebuild
similarity index 100%
rename from sys-kernel/linux-sabayon/linux-sabayon-2.6.39-r6.ebuild
rename to sys-kernel/linux-sabayon/linux-sabayon-2.6.39-r7.ebuild
diff --git a/sys-kernel/linux-server/Manifest b/sys-kernel/linux-server/Manifest
index 3543834ec..4790b094c 100644
--- a/sys-kernel/linux-server/Manifest
+++ b/sys-kernel/linux-server/Manifest
@@ -23,7 +23,7 @@ DIST linux-2.6.35.tar.bz2 69305709 RMD160 f5d91abb4fa72fac812578d830b22180d85a0e
 DIST linux-2.6.36.tar.bz2 70277083 RMD160 d739da505a79e71a1370d36e1373b36be055c123 SHA1 b546ab66458d7d614151d80adbc03b4d28977ae2 SHA256 15a076d1a435a6bf8e92834eba4b390b4ec094ce06d47f89d071ca9e5788ce04
 DIST linux-2.6.37.tar.bz2 73577826 RMD160 fced3801f3c94aa545c90e10981de616376a3b41 SHA1 eba83c89e71a86060ef6ff76aefff660aef819e2 SHA256 edbf091805414739cf57a3bbfeba9e87f5e74f97e38f04d12060e9e0c71e383a
 DIST linux-2.6.38.tar.bz2 74739098 RMD160 d1179be93f1309303b9aa6008a25b6247726e764 SHA1 02aade5ad3dedd70739c9b4a05de40edbe432d25 SHA256 72f0cfaefb8dc86b219d5a742dd0375332627641ecbdf5badd3158e2127b9304
-DIST linux-2.6.39-r6+sabayon.tar.bz2 76481435 RMD160 38fa2e2fa4e202615c5ce57ad8ca62848b302c2e SHA1 d237c0a7ba2712870811a71ff256be2137086a59 SHA256 d1310f0f57eaf0dffc9d9a4e91c33e4c85bac7516c18c9acf9f524e10df4b7f6
+DIST linux-2.6.39-r7+sabayon.tar.bz2 76482200 RMD160 600a0cc83a378f7989a0084256b0d9c52b4ec656 SHA1 90ef4f9ae353a518ba613dee57f6ecdea1cb0f39 SHA256 44a48acbd53de4445ce0790ba73d1a6499ecc7ae2036dec7de543feb5b331764
 DIST linux-2.6.39.tar.bz2 76096559 RMD160 feddc516bc15e78f12f611ff184d38baa4eac4ee SHA1 68518112821e55f4ac1df64f2e0e809cedfcc5ef SHA256 584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6
 DIST patch-2.6.34.6.bz2 185209 RMD160 75c9a569f8c80be7c418b75f7cde444fcc0a70ff SHA1 e033e2bc4b46e7cc8ee19c07b5ad6999b4c2a52d SHA256 a62e9392ad435948ea4ea2cce12e60e042da6e6da806691936ba50bbaa0dc8cc
 DIST patch-2.6.35.4.bz2 75980 RMD160 d3d050d516f6283b17d2e15075d57d6c41235254 SHA1 f17d865d5a8320d79869223049ebc36296a1dedd SHA256 03f88e20d9138fd710b338403b2fc97e43ecc34b1f6f0b0d203e03307485550e
@@ -64,5 +64,5 @@ EBUILD linux-server-2.6.37.ebuild 375 RMD160 e64c685398a411cc79678db3c3fe70fbec1
 EBUILD linux-server-2.6.38-r6.ebuild 376 RMD160 c274be06553599b9bf2adaacd1c2d685cec7539f SHA1 f62cd33e5ddf59b38730101cb66db2570992a364 SHA256 97577396e3546d529f62aefbdf4c49f7c78584778a6b9ea347d213c78ec35fb6
 EBUILD linux-server-2.6.38.ebuild 375 RMD160 e82201295b6bc12b7de8bec5d5bebc87a460e586 SHA1 2b9fc8f4780eb54b1610d3145adcfa2e59425499 SHA256 f1379f481c06b1b66060daf747a3fa70520f5d758316ff8a9a16fcb90c416b6e
 EBUILD linux-server-2.6.39-r1.ebuild 375 RMD160 f1187b6596f583f0be146c2f3952f0c9dbfe86e6 SHA1 7f719350326fb7881879b72232f8377eaeaaae34 SHA256 a14048c9291a4be16d1876b72e5f1afc4e62ddef0811b3af2982e656a7fc500a
-EBUILD linux-server-2.6.39-r6.ebuild 384 RMD160 cd2f10bb7e8dd8f65c340ca630a87e883a69b73a SHA1 e9cefa1282b7d1a333b5252866f3131b3e80ae05 SHA256 539b5a500e0e9caa46032404cde58cdff56536027e8e1e1a44c380edbcf10b34
+EBUILD linux-server-2.6.39-r7.ebuild 384 RMD160 cd2f10bb7e8dd8f65c340ca630a87e883a69b73a SHA1 e9cefa1282b7d1a333b5252866f3131b3e80ae05 SHA256 539b5a500e0e9caa46032404cde58cdff56536027e8e1e1a44c380edbcf10b34
 EBUILD linux-server-2.6.39.ebuild 375 RMD160 f1187b6596f583f0be146c2f3952f0c9dbfe86e6 SHA1 7f719350326fb7881879b72232f8377eaeaaae34 SHA256 a14048c9291a4be16d1876b72e5f1afc4e62ddef0811b3af2982e656a7fc500a
diff --git a/sys-kernel/linux-server/linux-server-2.6.39-r6.ebuild b/sys-kernel/linux-server/linux-server-2.6.39-r7.ebuild
similarity index 100%
rename from sys-kernel/linux-server/linux-server-2.6.39-r6.ebuild
rename to sys-kernel/linux-server/linux-server-2.6.39-r7.ebuild
diff --git a/sys-kernel/sabayon-sources/Manifest b/sys-kernel/sabayon-sources/Manifest
index 014462512..3795dcad4 100644
--- a/sys-kernel/sabayon-sources/Manifest
+++ b/sys-kernel/sabayon-sources/Manifest
@@ -24,7 +24,7 @@ DIST linux-2.6.35.tar.bz2 69305709 RMD160 f5d91abb4fa72fac812578d830b22180d85a0e
 DIST linux-2.6.36.tar.bz2 70277083 RMD160 d739da505a79e71a1370d36e1373b36be055c123 SHA1 b546ab66458d7d614151d80adbc03b4d28977ae2 SHA256 15a076d1a435a6bf8e92834eba4b390b4ec094ce06d47f89d071ca9e5788ce04
 DIST linux-2.6.37.tar.bz2 73577826 RMD160 fced3801f3c94aa545c90e10981de616376a3b41 SHA1 eba83c89e71a86060ef6ff76aefff660aef819e2 SHA256 edbf091805414739cf57a3bbfeba9e87f5e74f97e38f04d12060e9e0c71e383a
 DIST linux-2.6.38.tar.bz2 74739098 RMD160 d1179be93f1309303b9aa6008a25b6247726e764 SHA1 02aade5ad3dedd70739c9b4a05de40edbe432d25 SHA256 72f0cfaefb8dc86b219d5a742dd0375332627641ecbdf5badd3158e2127b9304
-DIST linux-2.6.39-r6+sabayon.tar.bz2 76481435 RMD160 38fa2e2fa4e202615c5ce57ad8ca62848b302c2e SHA1 d237c0a7ba2712870811a71ff256be2137086a59 SHA256 d1310f0f57eaf0dffc9d9a4e91c33e4c85bac7516c18c9acf9f524e10df4b7f6
+DIST linux-2.6.39-r7+sabayon.tar.bz2 76482200 RMD160 600a0cc83a378f7989a0084256b0d9c52b4ec656 SHA1 90ef4f9ae353a518ba613dee57f6ecdea1cb0f39 SHA256 44a48acbd53de4445ce0790ba73d1a6499ecc7ae2036dec7de543feb5b331764
 DIST linux-2.6.39.tar.bz2 76096559 RMD160 feddc516bc15e78f12f611ff184d38baa4eac4ee SHA1 68518112821e55f4ac1df64f2e0e809cedfcc5ef SHA256 584d17f2a3ee18a9501d7ff36907639e538cfdba4529978b8550c461d45c61f6
 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
@@ -71,5 +71,5 @@ EBUILD sabayon-sources-2.6.38-r1.ebuild 569 RMD160 2c892bf54db7bdf297dd4265fcfb4
 EBUILD sabayon-sources-2.6.38-r6.ebuild 570 RMD160 893c3beea91831424e01ba6bd47b6ba77c15bd72 SHA1 bfba6d0c0ae79bc42268e0759c883f2d53afe4d2 SHA256 69123b8de331905929df750675b001c1fd7a4777642e18ac29deb27662ccb0ce
 EBUILD sabayon-sources-2.6.38.ebuild 569 RMD160 2c892bf54db7bdf297dd4265fcfb4e1d138e1f41 SHA1 24ffc2c748e544944e7c0c5bfb30d5da8ba34a0e SHA256 62aad016d24012376d337dff7a5ca95084a0129f4223d90f040f050ca32f9f15
 EBUILD sabayon-sources-2.6.39-r1.ebuild 569 RMD160 b0aa9b0e422fa94c13ad25bd15cb7d7e3202a0fd SHA1 5c0cfc835b73595600a352dfcdd7173ca4c0e18c SHA256 71b9b08cab2db74aeca4d50fad18d40b75de6d7cd6d1f5eba6c96073241de5fc
-EBUILD sabayon-sources-2.6.39-r6.ebuild 525 RMD160 756178546ce51e110751cf8260ab30f8040d74f4 SHA1 f5a64c87dd3311250159325c9dd3a5f57fc8fdf7 SHA256 070887756b14c524c17c0b660810187fb3ad4581aa6b8baa69d6c847d9826de9
+EBUILD sabayon-sources-2.6.39-r7.ebuild 525 RMD160 756178546ce51e110751cf8260ab30f8040d74f4 SHA1 f5a64c87dd3311250159325c9dd3a5f57fc8fdf7 SHA256 070887756b14c524c17c0b660810187fb3ad4581aa6b8baa69d6c847d9826de9
 EBUILD sabayon-sources-2.6.39.ebuild 569 RMD160 b0aa9b0e422fa94c13ad25bd15cb7d7e3202a0fd SHA1 5c0cfc835b73595600a352dfcdd7173ca4c0e18c SHA256 71b9b08cab2db74aeca4d50fad18d40b75de6d7cd6d1f5eba6c96073241de5fc
diff --git a/sys-kernel/sabayon-sources/sabayon-sources-2.6.39-r6.ebuild b/sys-kernel/sabayon-sources/sabayon-sources-2.6.39-r7.ebuild
similarity index 100%
rename from sys-kernel/sabayon-sources/sabayon-sources-2.6.39-r6.ebuild
rename to sys-kernel/sabayon-sources/sabayon-sources-2.6.39-r7.ebuild
diff --git a/sys-kernel/server-sources/server-sources-2.6.39-r6.ebuild b/sys-kernel/server-sources/server-sources-2.6.39-r7.ebuild
similarity index 100%
rename from sys-kernel/server-sources/server-sources-2.6.39-r6.ebuild
rename to sys-kernel/server-sources/server-sources-2.6.39-r7.ebuild