diff --git a/sys-kernel/beagle-sources/Manifest b/sys-kernel/beagle-sources/Manifest
index 8ff732312..d68f2e4de 100644
--- a/sys-kernel/beagle-sources/Manifest
+++ b/sys-kernel/beagle-sources/Manifest
@@ -13,6 +13,7 @@ DIST linux-3.5+sabayon.tar.bz2 81434151 RMD160 608abdb0095caad8552169ff255517949
 DIST linux-3.5-r1+sabayon.tar.bz2 82414827 RMD160 e1f07a1496a0b6c9d4dd6aa3d2a093ccfa5aaacc SHA1 0e7c4b65f864d26005fe39d2ab0196dc18c69709 SHA256 b24102642ad9f47d13507f5c7170231520ffff31f59ad70edcdf072b5c3a4831
 DIST linux-3.5-r2+sabayon.tar.bz2 82413462 RMD160 9c91c95d9b06884154c94c9983c74c30bbac5d81 SHA1 f66d209059353e0b1348c3319543515b9747a296 SHA256 96f0796c49b09197e371e32fdd7dfeb36d136cec12edfb6121c8d8e0ed48c812
 DIST linux-3.5-r3+sabayon.tar.bz2 82419132 RMD160 2efd55927429bda7ad5be8c494488ababc48d014 SHA1 d097d011fd137f027b837c1bc43582f704bad014 SHA256 6a2c1e6ade660d8be0aed46ce1fc4c9e9959fed4b9e6fbac4823a347de15988e
+DIST linux-3.5-r4+sabayon.tar.bz2 82419945 RMD160 1f3d463ba5ceaeba5273200c908fae2a94708812 SHA1 35b3a671618f5ebe7d334c2f9a29932ec007ab48 SHA256 8cb8b6518e859f3a9aa12d040989d69e335b4932944d81b6ca2851db76e705df
 EBUILD beagle-sources-3.2-r9.ebuild 619 RMD160 4d1a92edd77b442727c7021503c88115d9cd99e5 SHA1 badf19a58a3d040d0c5573aa8f5c63ec4e168b4b SHA256 49f1f8e67f626d509e622e04cf953a51e8d3a9506994bf08a31c5642f22d2a4e
 EBUILD beagle-sources-3.3-r1.ebuild 620 RMD160 79d0230e1785eb5fc184641a942928ce47c9a552 SHA1 b3d06392e423a22fd779c38205f6420829faff97 SHA256 bdf8dba17e8e129b5e5105494d57360369a663ace5d75372e0084708d631db7b
 EBUILD beagle-sources-3.3-r2.ebuild 620 RMD160 79d0230e1785eb5fc184641a942928ce47c9a552 SHA1 b3d06392e423a22fd779c38205f6420829faff97 SHA256 bdf8dba17e8e129b5e5105494d57360369a663ace5d75372e0084708d631db7b
@@ -27,4 +28,5 @@ EBUILD beagle-sources-3.4.ebuild 620 RMD160 79d0230e1785eb5fc184641a942928ce47c9
 EBUILD beagle-sources-3.5-r1.ebuild 620 RMD160 79d0230e1785eb5fc184641a942928ce47c9a552 SHA1 b3d06392e423a22fd779c38205f6420829faff97 SHA256 bdf8dba17e8e129b5e5105494d57360369a663ace5d75372e0084708d631db7b
 EBUILD beagle-sources-3.5-r2.ebuild 620 RMD160 79d0230e1785eb5fc184641a942928ce47c9a552 SHA1 b3d06392e423a22fd779c38205f6420829faff97 SHA256 bdf8dba17e8e129b5e5105494d57360369a663ace5d75372e0084708d631db7b
 EBUILD beagle-sources-3.5-r3.ebuild 620 RMD160 79d0230e1785eb5fc184641a942928ce47c9a552 SHA1 b3d06392e423a22fd779c38205f6420829faff97 SHA256 bdf8dba17e8e129b5e5105494d57360369a663ace5d75372e0084708d631db7b
+EBUILD beagle-sources-3.5-r4.ebuild 620 RMD160 79d0230e1785eb5fc184641a942928ce47c9a552 SHA1 b3d06392e423a22fd779c38205f6420829faff97 SHA256 bdf8dba17e8e129b5e5105494d57360369a663ace5d75372e0084708d631db7b
 EBUILD beagle-sources-3.5.ebuild 620 RMD160 79d0230e1785eb5fc184641a942928ce47c9a552 SHA1 b3d06392e423a22fd779c38205f6420829faff97 SHA256 bdf8dba17e8e129b5e5105494d57360369a663ace5d75372e0084708d631db7b
diff --git a/sys-kernel/beagle-sources/beagle-sources-3.5-r4.ebuild b/sys-kernel/beagle-sources/beagle-sources-3.5-r4.ebuild
new file mode 100644
index 000000000..a17533226
--- /dev/null
+++ b/sys-kernel/beagle-sources/beagle-sources-3.5-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2004-2012 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+ETYPE="sources"
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_SABKERNEL_NAME="beagle"
+K_ONLY_SOURCES="1"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_SABKERNEL_ALT_CONFIG_FILE="${K_SABKERNEL_SELF_TARBALL_NAME}-${PV}-beagle+panda.config"
+inherit sabayon-kernel
+KEYWORDS="~arm"
+DESCRIPTION="Sabayon BeagleBoard (not yet Bone) OMAP3 Linux Kernel sources"
+RESTRICT="mirror"
+IUSE="sources_standalone"
+
+DEPEND="${DEPEND}
+	sources_standalone? ( !=sys-kernel/linux-beagle-${PVR} )
+	!sources_standalone? ( =sys-kernel/linux-beagle-${PVR} )"
diff --git a/sys-kernel/ec2-sources/Manifest b/sys-kernel/ec2-sources/Manifest
index 345dcbf5b..1e3721a92 100644
--- a/sys-kernel/ec2-sources/Manifest
+++ b/sys-kernel/ec2-sources/Manifest
@@ -3,8 +3,10 @@ DIST linux-3.5+sabayon.tar.bz2 81434151 RMD160 608abdb0095caad8552169ff255517949
 DIST linux-3.5-r1+sabayon.tar.bz2 82414827 RMD160 e1f07a1496a0b6c9d4dd6aa3d2a093ccfa5aaacc SHA1 0e7c4b65f864d26005fe39d2ab0196dc18c69709 SHA256 b24102642ad9f47d13507f5c7170231520ffff31f59ad70edcdf072b5c3a4831
 DIST linux-3.5-r2+sabayon.tar.bz2 82413462 RMD160 9c91c95d9b06884154c94c9983c74c30bbac5d81 SHA1 f66d209059353e0b1348c3319543515b9747a296 SHA256 96f0796c49b09197e371e32fdd7dfeb36d136cec12edfb6121c8d8e0ed48c812
 DIST linux-3.5-r3+sabayon.tar.bz2 82419132 RMD160 2efd55927429bda7ad5be8c494488ababc48d014 SHA1 d097d011fd137f027b837c1bc43582f704bad014 SHA256 6a2c1e6ade660d8be0aed46ce1fc4c9e9959fed4b9e6fbac4823a347de15988e
+DIST linux-3.5-r4+sabayon.tar.bz2 82419945 RMD160 1f3d463ba5ceaeba5273200c908fae2a94708812 SHA1 35b3a671618f5ebe7d334c2f9a29932ec007ab48 SHA256 8cb8b6518e859f3a9aa12d040989d69e335b4932944d81b6ca2851db76e705df
 EBUILD ec2-sources-3.4-r8.ebuild 525 RMD160 c02642dc2f6d2dd7d4bc8e31fe01ce58d87f19d1 SHA1 8406125d064269aa1ca6e65a34b198b97223863e SHA256 ad8e434f63fb20cb7c35a6a9aaccb240c9982cc9a5c435c26e6aaac4b083b929
 EBUILD ec2-sources-3.5-r1.ebuild 525 RMD160 c02642dc2f6d2dd7d4bc8e31fe01ce58d87f19d1 SHA1 8406125d064269aa1ca6e65a34b198b97223863e SHA256 ad8e434f63fb20cb7c35a6a9aaccb240c9982cc9a5c435c26e6aaac4b083b929
 EBUILD ec2-sources-3.5-r2.ebuild 525 RMD160 c02642dc2f6d2dd7d4bc8e31fe01ce58d87f19d1 SHA1 8406125d064269aa1ca6e65a34b198b97223863e SHA256 ad8e434f63fb20cb7c35a6a9aaccb240c9982cc9a5c435c26e6aaac4b083b929
 EBUILD ec2-sources-3.5-r3.ebuild 525 RMD160 c02642dc2f6d2dd7d4bc8e31fe01ce58d87f19d1 SHA1 8406125d064269aa1ca6e65a34b198b97223863e SHA256 ad8e434f63fb20cb7c35a6a9aaccb240c9982cc9a5c435c26e6aaac4b083b929
+EBUILD ec2-sources-3.5-r4.ebuild 525 RMD160 c02642dc2f6d2dd7d4bc8e31fe01ce58d87f19d1 SHA1 8406125d064269aa1ca6e65a34b198b97223863e SHA256 ad8e434f63fb20cb7c35a6a9aaccb240c9982cc9a5c435c26e6aaac4b083b929
 EBUILD ec2-sources-3.5.ebuild 525 RMD160 c02642dc2f6d2dd7d4bc8e31fe01ce58d87f19d1 SHA1 8406125d064269aa1ca6e65a34b198b97223863e SHA256 ad8e434f63fb20cb7c35a6a9aaccb240c9982cc9a5c435c26e6aaac4b083b929
diff --git a/sys-kernel/ec2-sources/ec2-sources-3.5-r4.ebuild b/sys-kernel/ec2-sources/ec2-sources-3.5-r4.ebuild
new file mode 100644
index 000000000..7898cb227
--- /dev/null
+++ b/sys-kernel/ec2-sources/ec2-sources-3.5-r4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2004-2010 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+ETYPE="sources"
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_SABKERNEL_NAME="ec2"
+K_ONLY_SOURCES="1"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+inherit sabayon-kernel
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Official Sabayon Linux kernel for Amazon EC2 AMI (S3/EBS)"
+RESTRICT="mirror"
+IUSE="sources_standalone"
+
+DEPEND="${DEPEND}
+	sources_standalone? ( !=sys-kernel/linux-ec2-${PVR} )
+	!sources_standalone? ( =sys-kernel/linux-ec2-${PVR} )"
diff --git a/sys-kernel/linux-beagle/Manifest b/sys-kernel/linux-beagle/Manifest
index d96bb5893..f42f55ca0 100644
--- a/sys-kernel/linux-beagle/Manifest
+++ b/sys-kernel/linux-beagle/Manifest
@@ -13,6 +13,7 @@ DIST linux-3.5+sabayon.tar.bz2 81434151 RMD160 608abdb0095caad8552169ff255517949
 DIST linux-3.5-r1+sabayon.tar.bz2 82414827 RMD160 e1f07a1496a0b6c9d4dd6aa3d2a093ccfa5aaacc SHA1 0e7c4b65f864d26005fe39d2ab0196dc18c69709 SHA256 b24102642ad9f47d13507f5c7170231520ffff31f59ad70edcdf072b5c3a4831
 DIST linux-3.5-r2+sabayon.tar.bz2 82413462 RMD160 9c91c95d9b06884154c94c9983c74c30bbac5d81 SHA1 f66d209059353e0b1348c3319543515b9747a296 SHA256 96f0796c49b09197e371e32fdd7dfeb36d136cec12edfb6121c8d8e0ed48c812
 DIST linux-3.5-r3+sabayon.tar.bz2 82419132 RMD160 2efd55927429bda7ad5be8c494488ababc48d014 SHA1 d097d011fd137f027b837c1bc43582f704bad014 SHA256 6a2c1e6ade660d8be0aed46ce1fc4c9e9959fed4b9e6fbac4823a347de15988e
+DIST linux-3.5-r4+sabayon.tar.bz2 82419945 RMD160 1f3d463ba5ceaeba5273200c908fae2a94708812 SHA1 35b3a671618f5ebe7d334c2f9a29932ec007ab48 SHA256 8cb8b6518e859f3a9aa12d040989d69e335b4932944d81b6ca2851db76e705df
 EBUILD linux-beagle-3.2-r9.ebuild 594 RMD160 270adf315222a6727e59adb268b48f85fdd60d54 SHA1 49aa25fd47c7c0b38e945e097a777da412ec335e SHA256 cfeb3358f58f28e5bc349c4830a41f942c3e7490226fe355845a662aa491d6ba
 EBUILD linux-beagle-3.3-r1.ebuild 595 RMD160 df95d810acee174a17a8109e822fcb067a8c81d3 SHA1 2fc3f258e701d3c52ab00977b438005a71196afa SHA256 e882d9f938eff50b9cb370c6bfd91d04d637d2300c71401724697379cb3783bd
 EBUILD linux-beagle-3.3-r2.ebuild 595 RMD160 df95d810acee174a17a8109e822fcb067a8c81d3 SHA1 2fc3f258e701d3c52ab00977b438005a71196afa SHA256 e882d9f938eff50b9cb370c6bfd91d04d637d2300c71401724697379cb3783bd
@@ -27,4 +28,5 @@ EBUILD linux-beagle-3.4.ebuild 595 RMD160 df95d810acee174a17a8109e822fcb067a8c81
 EBUILD linux-beagle-3.5-r1.ebuild 595 RMD160 df95d810acee174a17a8109e822fcb067a8c81d3 SHA1 2fc3f258e701d3c52ab00977b438005a71196afa SHA256 e882d9f938eff50b9cb370c6bfd91d04d637d2300c71401724697379cb3783bd
 EBUILD linux-beagle-3.5-r2.ebuild 595 RMD160 df95d810acee174a17a8109e822fcb067a8c81d3 SHA1 2fc3f258e701d3c52ab00977b438005a71196afa SHA256 e882d9f938eff50b9cb370c6bfd91d04d637d2300c71401724697379cb3783bd
 EBUILD linux-beagle-3.5-r3.ebuild 595 RMD160 df95d810acee174a17a8109e822fcb067a8c81d3 SHA1 2fc3f258e701d3c52ab00977b438005a71196afa SHA256 e882d9f938eff50b9cb370c6bfd91d04d637d2300c71401724697379cb3783bd
+EBUILD linux-beagle-3.5-r4.ebuild 595 RMD160 df95d810acee174a17a8109e822fcb067a8c81d3 SHA1 2fc3f258e701d3c52ab00977b438005a71196afa SHA256 e882d9f938eff50b9cb370c6bfd91d04d637d2300c71401724697379cb3783bd
 EBUILD linux-beagle-3.5.ebuild 595 RMD160 df95d810acee174a17a8109e822fcb067a8c81d3 SHA1 2fc3f258e701d3c52ab00977b438005a71196afa SHA256 e882d9f938eff50b9cb370c6bfd91d04d637d2300c71401724697379cb3783bd
diff --git a/sys-kernel/linux-beagle/linux-beagle-3.5-r4.ebuild b/sys-kernel/linux-beagle/linux-beagle-3.5-r4.ebuild
new file mode 100644
index 000000000..c7c82a143
--- /dev/null
+++ b/sys-kernel/linux-beagle/linux-beagle-3.5-r4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2004-2012 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+ETYPE="sources"
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_KERNEL_SOURCES_PKG="sys-kernel/beagle-sources-${PVR}"
+K_REQUIRED_LINUX_FIRMWARE_VER="20120219"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_MKIMAGE_RAMDISK_ADDRESS="0x81000000"
+K_MKIMAGE_RAMDISK_ENTRYPOINT="0x00000000"
+K_SABKERNEL_ALT_CONFIG_FILE="${K_SABKERNEL_SELF_TARBALL_NAME}-${PV}-beagle+panda.config"
+inherit sabayon-kernel
+KEYWORDS="~arm"
+DESCRIPTION="Sabayon BeagleBoard (not yet Bone) OMAP3 Linux Kernel and modules"
+RESTRICT="mirror"
diff --git a/sys-kernel/linux-ec2/Manifest b/sys-kernel/linux-ec2/Manifest
index 3be61f78e..590078253 100644
--- a/sys-kernel/linux-ec2/Manifest
+++ b/sys-kernel/linux-ec2/Manifest
@@ -3,8 +3,10 @@ DIST linux-3.5+sabayon.tar.bz2 81434151 RMD160 608abdb0095caad8552169ff255517949
 DIST linux-3.5-r1+sabayon.tar.bz2 82414827 RMD160 e1f07a1496a0b6c9d4dd6aa3d2a093ccfa5aaacc SHA1 0e7c4b65f864d26005fe39d2ab0196dc18c69709 SHA256 b24102642ad9f47d13507f5c7170231520ffff31f59ad70edcdf072b5c3a4831
 DIST linux-3.5-r2+sabayon.tar.bz2 82413462 RMD160 9c91c95d9b06884154c94c9983c74c30bbac5d81 SHA1 f66d209059353e0b1348c3319543515b9747a296 SHA256 96f0796c49b09197e371e32fdd7dfeb36d136cec12edfb6121c8d8e0ed48c812
 DIST linux-3.5-r3+sabayon.tar.bz2 82419132 RMD160 2efd55927429bda7ad5be8c494488ababc48d014 SHA1 d097d011fd137f027b837c1bc43582f704bad014 SHA256 6a2c1e6ade660d8be0aed46ce1fc4c9e9959fed4b9e6fbac4823a347de15988e
+DIST linux-3.5-r4+sabayon.tar.bz2 82419945 RMD160 1f3d463ba5ceaeba5273200c908fae2a94708812 SHA1 35b3a671618f5ebe7d334c2f9a29932ec007ab48 SHA256 8cb8b6518e859f3a9aa12d040989d69e335b4932944d81b6ca2851db76e705df
 EBUILD linux-ec2-3.4-r8.ebuild 406 RMD160 9f5096bcfb4a5da1f7cd3ac1a78a1cc450a7ed90 SHA1 c6aa115156bb77840c4223ced2541db8ff258e9d SHA256 76565664d8a41309f789da86aaa2821638dad3859226eb722039a09ca01beebd
 EBUILD linux-ec2-3.5-r1.ebuild 406 RMD160 9f5096bcfb4a5da1f7cd3ac1a78a1cc450a7ed90 SHA1 c6aa115156bb77840c4223ced2541db8ff258e9d SHA256 76565664d8a41309f789da86aaa2821638dad3859226eb722039a09ca01beebd
 EBUILD linux-ec2-3.5-r2.ebuild 406 RMD160 9f5096bcfb4a5da1f7cd3ac1a78a1cc450a7ed90 SHA1 c6aa115156bb77840c4223ced2541db8ff258e9d SHA256 76565664d8a41309f789da86aaa2821638dad3859226eb722039a09ca01beebd
 EBUILD linux-ec2-3.5-r3.ebuild 406 RMD160 9f5096bcfb4a5da1f7cd3ac1a78a1cc450a7ed90 SHA1 c6aa115156bb77840c4223ced2541db8ff258e9d SHA256 76565664d8a41309f789da86aaa2821638dad3859226eb722039a09ca01beebd
+EBUILD linux-ec2-3.5-r4.ebuild 406 RMD160 9f5096bcfb4a5da1f7cd3ac1a78a1cc450a7ed90 SHA1 c6aa115156bb77840c4223ced2541db8ff258e9d SHA256 76565664d8a41309f789da86aaa2821638dad3859226eb722039a09ca01beebd
 EBUILD linux-ec2-3.5.ebuild 406 RMD160 9f5096bcfb4a5da1f7cd3ac1a78a1cc450a7ed90 SHA1 c6aa115156bb77840c4223ced2541db8ff258e9d SHA256 76565664d8a41309f789da86aaa2821638dad3859226eb722039a09ca01beebd
diff --git a/sys-kernel/linux-ec2/linux-ec2-3.5-r4.ebuild b/sys-kernel/linux-ec2/linux-ec2-3.5-r4.ebuild
new file mode 100644
index 000000000..ed8cb4746
--- /dev/null
+++ b/sys-kernel/linux-ec2/linux-ec2-3.5-r4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2004-2010 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+ETYPE="sources"
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_KERNEL_SOURCES_PKG="sys-kernel/ec2-sources-${PVR}"
+K_REQUIRED_LINUX_FIRMWARE_VER="20120219"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+inherit sabayon-kernel
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Official Sabayon Linux Server kernel image"
+RESTRICT="mirror"
diff --git a/sys-kernel/linux-panda/Manifest b/sys-kernel/linux-panda/Manifest
index d6058ebdd..165332684 100644
--- a/sys-kernel/linux-panda/Manifest
+++ b/sys-kernel/linux-panda/Manifest
@@ -13,6 +13,7 @@ DIST linux-3.5+sabayon.tar.bz2 81434151 RMD160 608abdb0095caad8552169ff255517949
 DIST linux-3.5-r1+sabayon.tar.bz2 82414827 RMD160 e1f07a1496a0b6c9d4dd6aa3d2a093ccfa5aaacc SHA1 0e7c4b65f864d26005fe39d2ab0196dc18c69709 SHA256 b24102642ad9f47d13507f5c7170231520ffff31f59ad70edcdf072b5c3a4831
 DIST linux-3.5-r2+sabayon.tar.bz2 82413462 RMD160 9c91c95d9b06884154c94c9983c74c30bbac5d81 SHA1 f66d209059353e0b1348c3319543515b9747a296 SHA256 96f0796c49b09197e371e32fdd7dfeb36d136cec12edfb6121c8d8e0ed48c812
 DIST linux-3.5-r3+sabayon.tar.bz2 82419132 RMD160 2efd55927429bda7ad5be8c494488ababc48d014 SHA1 d097d011fd137f027b837c1bc43582f704bad014 SHA256 6a2c1e6ade660d8be0aed46ce1fc4c9e9959fed4b9e6fbac4823a347de15988e
+DIST linux-3.5-r4+sabayon.tar.bz2 82419945 RMD160 1f3d463ba5ceaeba5273200c908fae2a94708812 SHA1 35b3a671618f5ebe7d334c2f9a29932ec007ab48 SHA256 8cb8b6518e859f3a9aa12d040989d69e335b4932944d81b6ca2851db76e705df
 EBUILD linux-panda-3.2-r11.ebuild 576 RMD160 ba5d95d5c4b0f5cd2cc641413b3709a395fb6c47 SHA1 c8159293a77963f4670f3dcb03be10c3829eeb4d SHA256 2596e0c0f1826ec67fb8bf8b0311a13c0db178b7bec410dac9728b2933f1ca09
 EBUILD linux-panda-3.3-r1.ebuild 578 RMD160 5a8dc107b0f36f072fb940fb089bfd96876b44f3 SHA1 c246448cc8417215c18f2afaf474449bca9b8c46 SHA256 e881ee0eb1e8ef2147a4f12d941c0b2362494717d4764f0835e7c0ec0694487e
 EBUILD linux-panda-3.3-r2.ebuild 578 RMD160 5a8dc107b0f36f072fb940fb089bfd96876b44f3 SHA1 c246448cc8417215c18f2afaf474449bca9b8c46 SHA256 e881ee0eb1e8ef2147a4f12d941c0b2362494717d4764f0835e7c0ec0694487e
@@ -27,4 +28,5 @@ EBUILD linux-panda-3.4.ebuild 578 RMD160 5a8dc107b0f36f072fb940fb089bfd96876b44f
 EBUILD linux-panda-3.5-r1.ebuild 578 RMD160 5a8dc107b0f36f072fb940fb089bfd96876b44f3 SHA1 c246448cc8417215c18f2afaf474449bca9b8c46 SHA256 e881ee0eb1e8ef2147a4f12d941c0b2362494717d4764f0835e7c0ec0694487e
 EBUILD linux-panda-3.5-r2.ebuild 578 RMD160 5a8dc107b0f36f072fb940fb089bfd96876b44f3 SHA1 c246448cc8417215c18f2afaf474449bca9b8c46 SHA256 e881ee0eb1e8ef2147a4f12d941c0b2362494717d4764f0835e7c0ec0694487e
 EBUILD linux-panda-3.5-r3.ebuild 578 RMD160 5a8dc107b0f36f072fb940fb089bfd96876b44f3 SHA1 c246448cc8417215c18f2afaf474449bca9b8c46 SHA256 e881ee0eb1e8ef2147a4f12d941c0b2362494717d4764f0835e7c0ec0694487e
+EBUILD linux-panda-3.5-r4.ebuild 578 RMD160 5a8dc107b0f36f072fb940fb089bfd96876b44f3 SHA1 c246448cc8417215c18f2afaf474449bca9b8c46 SHA256 e881ee0eb1e8ef2147a4f12d941c0b2362494717d4764f0835e7c0ec0694487e
 EBUILD linux-panda-3.5.ebuild 578 RMD160 5a8dc107b0f36f072fb940fb089bfd96876b44f3 SHA1 c246448cc8417215c18f2afaf474449bca9b8c46 SHA256 e881ee0eb1e8ef2147a4f12d941c0b2362494717d4764f0835e7c0ec0694487e
diff --git a/sys-kernel/linux-panda/linux-panda-3.5-r4.ebuild b/sys-kernel/linux-panda/linux-panda-3.5-r4.ebuild
new file mode 100644
index 000000000..82b2c96c6
--- /dev/null
+++ b/sys-kernel/linux-panda/linux-panda-3.5-r4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2004-2012 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+ETYPE="sources"
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_KERNEL_SOURCES_PKG="sys-kernel/panda-sources-${PVR}"
+K_REQUIRED_LINUX_FIRMWARE_VER="20120219"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_MKIMAGE_RAMDISK_ADDRESS="0x81000000"
+K_MKIMAGE_RAMDISK_ENTRYPOINT="0x00000000"
+K_SABKERNEL_ALT_CONFIG_FILE="${K_SABKERNEL_SELF_TARBALL_NAME}-${PV}-beagle+panda.config"
+inherit sabayon-kernel
+KEYWORDS="~arm"
+DESCRIPTION="Sabayon PandaBoard OMAP4 Linux Kernel and modules"
+RESTRICT="mirror"
diff --git a/sys-kernel/linux-sabayon/Manifest b/sys-kernel/linux-sabayon/Manifest
index 1e14a53ba..b1205fc3e 100644
--- a/sys-kernel/linux-sabayon/Manifest
+++ b/sys-kernel/linux-sabayon/Manifest
@@ -43,6 +43,7 @@ DIST linux-3.5+sabayon.tar.bz2 81434151 RMD160 608abdb0095caad8552169ff255517949
 DIST linux-3.5-r1+sabayon.tar.bz2 82414827 RMD160 e1f07a1496a0b6c9d4dd6aa3d2a093ccfa5aaacc SHA1 0e7c4b65f864d26005fe39d2ab0196dc18c69709 SHA256 b24102642ad9f47d13507f5c7170231520ffff31f59ad70edcdf072b5c3a4831
 DIST linux-3.5-r2+sabayon.tar.bz2 82413462 RMD160 9c91c95d9b06884154c94c9983c74c30bbac5d81 SHA1 f66d209059353e0b1348c3319543515b9747a296 SHA256 96f0796c49b09197e371e32fdd7dfeb36d136cec12edfb6121c8d8e0ed48c812
 DIST linux-3.5-r3+sabayon.tar.bz2 82419132 RMD160 2efd55927429bda7ad5be8c494488ababc48d014 SHA1 d097d011fd137f027b837c1bc43582f704bad014 SHA256 6a2c1e6ade660d8be0aed46ce1fc4c9e9959fed4b9e6fbac4823a347de15988e
+DIST linux-3.5-r4+sabayon.tar.bz2 82419945 RMD160 1f3d463ba5ceaeba5273200c908fae2a94708812 SHA1 35b3a671618f5ebe7d334c2f9a29932ec007ab48 SHA256 8cb8b6518e859f3a9aa12d040989d69e335b4932944d81b6ca2851db76e705df
 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
 DIST sabayon-2.6.36-r1-amd64.config 116583 RMD160 e089646ec9398182336bb1a88097c611f422135d SHA1 c1c8e2cdfbf24b34aafb858f2441c44b4fd8118b SHA256 cca3b07fb556cd3602787356dcfd9b903145872aadfb9a4782719a8845ad788e
@@ -80,4 +81,5 @@ EBUILD linux-sabayon-3.4.ebuild 356 RMD160 9e1930ed6676c73512567b2da40c45632c6da
 EBUILD linux-sabayon-3.5-r1.ebuild 356 RMD160 9e1930ed6676c73512567b2da40c45632c6da80c SHA1 153c4bcbf9a16119af84e772ee5b24eaaf4d07df SHA256 f3b3e2c4d19bdaafe9438c2e215c3a03fd022115f14012874ce8355acf27489c
 EBUILD linux-sabayon-3.5-r2.ebuild 356 RMD160 9e1930ed6676c73512567b2da40c45632c6da80c SHA1 153c4bcbf9a16119af84e772ee5b24eaaf4d07df SHA256 f3b3e2c4d19bdaafe9438c2e215c3a03fd022115f14012874ce8355acf27489c
 EBUILD linux-sabayon-3.5-r3.ebuild 356 RMD160 9e1930ed6676c73512567b2da40c45632c6da80c SHA1 153c4bcbf9a16119af84e772ee5b24eaaf4d07df SHA256 f3b3e2c4d19bdaafe9438c2e215c3a03fd022115f14012874ce8355acf27489c
+EBUILD linux-sabayon-3.5-r4.ebuild 356 RMD160 9e1930ed6676c73512567b2da40c45632c6da80c SHA1 153c4bcbf9a16119af84e772ee5b24eaaf4d07df SHA256 f3b3e2c4d19bdaafe9438c2e215c3a03fd022115f14012874ce8355acf27489c
 EBUILD linux-sabayon-3.5.ebuild 486 RMD160 a6309ea35fb097119d02dba98ef45b1070381e3f SHA1 c49f7fe9bce4f792648f0a7821c9ffb8213139c6 SHA256 7e48bb0229072fa36c42e53b4b067ce6a8f62f596154611d64da7b65ec9069ad
diff --git a/sys-kernel/linux-sabayon/linux-sabayon-3.5-r4.ebuild b/sys-kernel/linux-sabayon/linux-sabayon-3.5-r4.ebuild
new file mode 100644
index 000000000..cfdc8ce73
--- /dev/null
+++ b/sys-kernel/linux-sabayon/linux-sabayon-3.5-r4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2004-2010 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+ETYPE="sources"
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_REQUIRED_LINUX_FIRMWARE_VER="20120219"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+inherit sabayon-kernel
+
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Official Sabayon Linux Standard kernel image"
+RESTRICT="mirror"
diff --git a/sys-kernel/linux-server/Manifest b/sys-kernel/linux-server/Manifest
index c64305a3c..24d782738 100644
--- a/sys-kernel/linux-server/Manifest
+++ b/sys-kernel/linux-server/Manifest
@@ -37,6 +37,7 @@ DIST linux-3.5+sabayon.tar.bz2 81434151 RMD160 608abdb0095caad8552169ff255517949
 DIST linux-3.5-r1+sabayon.tar.bz2 82414827 RMD160 e1f07a1496a0b6c9d4dd6aa3d2a093ccfa5aaacc SHA1 0e7c4b65f864d26005fe39d2ab0196dc18c69709 SHA256 b24102642ad9f47d13507f5c7170231520ffff31f59ad70edcdf072b5c3a4831
 DIST linux-3.5-r2+sabayon.tar.bz2 82413462 RMD160 9c91c95d9b06884154c94c9983c74c30bbac5d81 SHA1 f66d209059353e0b1348c3319543515b9747a296 SHA256 96f0796c49b09197e371e32fdd7dfeb36d136cec12edfb6121c8d8e0ed48c812
 DIST linux-3.5-r3+sabayon.tar.bz2 82419132 RMD160 2efd55927429bda7ad5be8c494488ababc48d014 SHA1 d097d011fd137f027b837c1bc43582f704bad014 SHA256 6a2c1e6ade660d8be0aed46ce1fc4c9e9959fed4b9e6fbac4823a347de15988e
+DIST linux-3.5-r4+sabayon.tar.bz2 82419945 RMD160 1f3d463ba5ceaeba5273200c908fae2a94708812 SHA1 35b3a671618f5ebe7d334c2f9a29932ec007ab48 SHA256 8cb8b6518e859f3a9aa12d040989d69e335b4932944d81b6ca2851db76e705df
 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
@@ -83,4 +84,5 @@ EBUILD linux-server-3.4.ebuild 409 RMD160 7f6ed40be8f29f4a5dd68ba7c0236acc25fb06
 EBUILD linux-server-3.5-r1.ebuild 409 RMD160 7f6ed40be8f29f4a5dd68ba7c0236acc25fb0619 SHA1 bc6fea68ad1027a45fe85fd8ff95b61ece41d6f4 SHA256 8f4e01790cd551947a4fa6fcf60a1caa4e104077d8d82f764f75528a0d6c483b
 EBUILD linux-server-3.5-r2.ebuild 409 RMD160 7f6ed40be8f29f4a5dd68ba7c0236acc25fb0619 SHA1 bc6fea68ad1027a45fe85fd8ff95b61ece41d6f4 SHA256 8f4e01790cd551947a4fa6fcf60a1caa4e104077d8d82f764f75528a0d6c483b
 EBUILD linux-server-3.5-r3.ebuild 409 RMD160 7f6ed40be8f29f4a5dd68ba7c0236acc25fb0619 SHA1 bc6fea68ad1027a45fe85fd8ff95b61ece41d6f4 SHA256 8f4e01790cd551947a4fa6fcf60a1caa4e104077d8d82f764f75528a0d6c483b
+EBUILD linux-server-3.5-r4.ebuild 409 RMD160 7f6ed40be8f29f4a5dd68ba7c0236acc25fb0619 SHA1 bc6fea68ad1027a45fe85fd8ff95b61ece41d6f4 SHA256 8f4e01790cd551947a4fa6fcf60a1caa4e104077d8d82f764f75528a0d6c483b
 EBUILD linux-server-3.5.ebuild 539 RMD160 7b9ff6b917b1e8ef485055baaba2a5743ffe008c SHA1 61345ba7d4c46536aa27ad6e057e440d256c5cda SHA256 579b049dd373669bc3eb2b76403141e7f1c2326ce7b11c12bee9274b2010668b
diff --git a/sys-kernel/linux-server/linux-server-3.5-r4.ebuild b/sys-kernel/linux-server/linux-server-3.5-r4.ebuild
new file mode 100644
index 000000000..3faea4fda
--- /dev/null
+++ b/sys-kernel/linux-server/linux-server-3.5-r4.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2004-2010 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+ETYPE="sources"
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_KERNEL_SOURCES_PKG="sys-kernel/server-sources-${PVR}"
+K_REQUIRED_LINUX_FIRMWARE_VER="20120219"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+inherit sabayon-kernel
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Official Sabayon Linux Server kernel image"
+RESTRICT="mirror"
diff --git a/sys-kernel/panda-sources/Manifest b/sys-kernel/panda-sources/Manifest
index c4199e673..6cf6ad42b 100644
--- a/sys-kernel/panda-sources/Manifest
+++ b/sys-kernel/panda-sources/Manifest
@@ -13,6 +13,7 @@ DIST linux-3.5+sabayon.tar.bz2 81434151 RMD160 608abdb0095caad8552169ff255517949
 DIST linux-3.5-r1+sabayon.tar.bz2 82414827 RMD160 e1f07a1496a0b6c9d4dd6aa3d2a093ccfa5aaacc SHA1 0e7c4b65f864d26005fe39d2ab0196dc18c69709 SHA256 b24102642ad9f47d13507f5c7170231520ffff31f59ad70edcdf072b5c3a4831
 DIST linux-3.5-r2+sabayon.tar.bz2 82413462 RMD160 9c91c95d9b06884154c94c9983c74c30bbac5d81 SHA1 f66d209059353e0b1348c3319543515b9747a296 SHA256 96f0796c49b09197e371e32fdd7dfeb36d136cec12edfb6121c8d8e0ed48c812
 DIST linux-3.5-r3+sabayon.tar.bz2 82419132 RMD160 2efd55927429bda7ad5be8c494488ababc48d014 SHA1 d097d011fd137f027b837c1bc43582f704bad014 SHA256 6a2c1e6ade660d8be0aed46ce1fc4c9e9959fed4b9e6fbac4823a347de15988e
+DIST linux-3.5-r4+sabayon.tar.bz2 82419945 RMD160 1f3d463ba5ceaeba5273200c908fae2a94708812 SHA1 35b3a671618f5ebe7d334c2f9a29932ec007ab48 SHA256 8cb8b6518e859f3a9aa12d040989d69e335b4932944d81b6ca2851db76e705df
 EBUILD panda-sources-3.2-r11.ebuild 599 RMD160 3b9bb9a19f5b5bbd4e9c0d44d5656666b47e5496 SHA1 e9e56bb9694d61e995bf5da2771916d6ea3c687d SHA256 3afe4d61d33cc189fe91a18e017c0155da058ba1faeabf86c7b9b6005ebcc7ff
 EBUILD panda-sources-3.3-r1.ebuild 601 RMD160 56d95d4920f1155831b2ee79cec7b44c02b9d517 SHA1 162899f6e8f9106ced811787892464e6ed92773d SHA256 e73d94dbb488b3119cc36a79d35ae74c848cfc12ff6b23c76c65d4370e8e83f9
 EBUILD panda-sources-3.3-r2.ebuild 601 RMD160 56d95d4920f1155831b2ee79cec7b44c02b9d517 SHA1 162899f6e8f9106ced811787892464e6ed92773d SHA256 e73d94dbb488b3119cc36a79d35ae74c848cfc12ff6b23c76c65d4370e8e83f9
@@ -27,4 +28,5 @@ EBUILD panda-sources-3.4.ebuild 601 RMD160 56d95d4920f1155831b2ee79cec7b44c02b9d
 EBUILD panda-sources-3.5-r1.ebuild 601 RMD160 56d95d4920f1155831b2ee79cec7b44c02b9d517 SHA1 162899f6e8f9106ced811787892464e6ed92773d SHA256 e73d94dbb488b3119cc36a79d35ae74c848cfc12ff6b23c76c65d4370e8e83f9
 EBUILD panda-sources-3.5-r2.ebuild 601 RMD160 56d95d4920f1155831b2ee79cec7b44c02b9d517 SHA1 162899f6e8f9106ced811787892464e6ed92773d SHA256 e73d94dbb488b3119cc36a79d35ae74c848cfc12ff6b23c76c65d4370e8e83f9
 EBUILD panda-sources-3.5-r3.ebuild 601 RMD160 56d95d4920f1155831b2ee79cec7b44c02b9d517 SHA1 162899f6e8f9106ced811787892464e6ed92773d SHA256 e73d94dbb488b3119cc36a79d35ae74c848cfc12ff6b23c76c65d4370e8e83f9
+EBUILD panda-sources-3.5-r4.ebuild 601 RMD160 56d95d4920f1155831b2ee79cec7b44c02b9d517 SHA1 162899f6e8f9106ced811787892464e6ed92773d SHA256 e73d94dbb488b3119cc36a79d35ae74c848cfc12ff6b23c76c65d4370e8e83f9
 EBUILD panda-sources-3.5.ebuild 601 RMD160 56d95d4920f1155831b2ee79cec7b44c02b9d517 SHA1 162899f6e8f9106ced811787892464e6ed92773d SHA256 e73d94dbb488b3119cc36a79d35ae74c848cfc12ff6b23c76c65d4370e8e83f9
diff --git a/sys-kernel/panda-sources/panda-sources-3.5-r4.ebuild b/sys-kernel/panda-sources/panda-sources-3.5-r4.ebuild
new file mode 100644
index 000000000..b8c654f68
--- /dev/null
+++ b/sys-kernel/panda-sources/panda-sources-3.5-r4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2004-2012 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+ETYPE="sources"
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_SABKERNEL_NAME="panda"
+K_ONLY_SOURCES="1"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+K_SABKERNEL_ALT_CONFIG_FILE="${K_SABKERNEL_SELF_TARBALL_NAME}-${PV}-beagle+panda.config"
+inherit sabayon-kernel
+KEYWORDS="~arm"
+DESCRIPTION="Sabayon PandaBoard OMAP4 Linux Kernel sources"
+RESTRICT="mirror"
+IUSE="sources_standalone"
+
+DEPEND="${DEPEND}
+	sources_standalone? ( !=sys-kernel/linux-panda-${PVR} )
+	!sources_standalone? ( =sys-kernel/linux-panda-${PVR} )"
diff --git a/sys-kernel/sabayon-sources/Manifest b/sys-kernel/sabayon-sources/Manifest
index a027d9574..fe17e91ca 100644
--- a/sys-kernel/sabayon-sources/Manifest
+++ b/sys-kernel/sabayon-sources/Manifest
@@ -43,6 +43,7 @@ DIST linux-3.5+sabayon.tar.bz2 81434151 RMD160 608abdb0095caad8552169ff255517949
 DIST linux-3.5-r1+sabayon.tar.bz2 82414827 RMD160 e1f07a1496a0b6c9d4dd6aa3d2a093ccfa5aaacc SHA1 0e7c4b65f864d26005fe39d2ab0196dc18c69709 SHA256 b24102642ad9f47d13507f5c7170231520ffff31f59ad70edcdf072b5c3a4831
 DIST linux-3.5-r2+sabayon.tar.bz2 82413462 RMD160 9c91c95d9b06884154c94c9983c74c30bbac5d81 SHA1 f66d209059353e0b1348c3319543515b9747a296 SHA256 96f0796c49b09197e371e32fdd7dfeb36d136cec12edfb6121c8d8e0ed48c812
 DIST linux-3.5-r3+sabayon.tar.bz2 82419132 RMD160 2efd55927429bda7ad5be8c494488ababc48d014 SHA1 d097d011fd137f027b837c1bc43582f704bad014 SHA256 6a2c1e6ade660d8be0aed46ce1fc4c9e9959fed4b9e6fbac4823a347de15988e
+DIST linux-3.5-r4+sabayon.tar.bz2 82419945 RMD160 1f3d463ba5ceaeba5273200c908fae2a94708812 SHA1 35b3a671618f5ebe7d334c2f9a29932ec007ab48 SHA256 8cb8b6518e859f3a9aa12d040989d69e335b4932944d81b6ca2851db76e705df
 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
 DIST sabayon-2.6.36-r1-amd64.config 116583 RMD160 e089646ec9398182336bb1a88097c611f422135d SHA1 c1c8e2cdfbf24b34aafb858f2441c44b4fd8118b SHA256 cca3b07fb556cd3602787356dcfd9b903145872aadfb9a4782719a8845ad788e
@@ -80,4 +81,5 @@ EBUILD sabayon-sources-3.4.ebuild 556 RMD160 f5e82498df737f94fd0ee6dc4d719f0d333
 EBUILD sabayon-sources-3.5-r1.ebuild 556 RMD160 f5e82498df737f94fd0ee6dc4d719f0d333aae9c SHA1 d3ed4c24f8b820840b4caaba92b8bf9ca91de4a1 SHA256 7ce9a2e2f5165a08bb2276be9b653144d58114fb77dc5bc43c6bbc112cca2462
 EBUILD sabayon-sources-3.5-r2.ebuild 556 RMD160 f5e82498df737f94fd0ee6dc4d719f0d333aae9c SHA1 d3ed4c24f8b820840b4caaba92b8bf9ca91de4a1 SHA256 7ce9a2e2f5165a08bb2276be9b653144d58114fb77dc5bc43c6bbc112cca2462
 EBUILD sabayon-sources-3.5-r3.ebuild 556 RMD160 f5e82498df737f94fd0ee6dc4d719f0d333aae9c SHA1 d3ed4c24f8b820840b4caaba92b8bf9ca91de4a1 SHA256 7ce9a2e2f5165a08bb2276be9b653144d58114fb77dc5bc43c6bbc112cca2462
+EBUILD sabayon-sources-3.5-r4.ebuild 556 RMD160 f5e82498df737f94fd0ee6dc4d719f0d333aae9c SHA1 d3ed4c24f8b820840b4caaba92b8bf9ca91de4a1 SHA256 7ce9a2e2f5165a08bb2276be9b653144d58114fb77dc5bc43c6bbc112cca2462
 EBUILD sabayon-sources-3.5.ebuild 686 RMD160 114f4ea3aab7846826591226723a1ba4417149ba SHA1 80d25b113c543529d796497cb889ca825405749c SHA256 3498c41e66c706b644d63dea9b7df7dc408200076585b7cfa5ac85a24e3a060e
diff --git a/sys-kernel/sabayon-sources/sabayon-sources-3.5-r4.ebuild b/sys-kernel/sabayon-sources/sabayon-sources-3.5-r4.ebuild
new file mode 100644
index 000000000..47e1bf8c6
--- /dev/null
+++ b/sys-kernel/sabayon-sources/sabayon-sources-3.5-r4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2004-2010 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+ETYPE="sources"
+K_SABKERNEL_NAME="sabayon"
+K_SABKERNEL_URI_CONFIG="yes"
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_ONLY_SOURCES="1"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+inherit sabayon-kernel
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Official Sabayon Linux Standard kernel sources"
+RESTRICT="mirror"
+IUSE="sources_standalone"
+
+DEPEND="${DEPEND}
+	sources_standalone? ( !=sys-kernel/linux-sabayon-${PVR} )
+	!sources_standalone? ( =sys-kernel/linux-sabayon-${PVR} )"
+
diff --git a/sys-kernel/server-sources/Manifest b/sys-kernel/server-sources/Manifest
index 8567481f1..690b7b947 100644
--- a/sys-kernel/server-sources/Manifest
+++ b/sys-kernel/server-sources/Manifest
@@ -39,6 +39,7 @@ DIST linux-3.5+sabayon.tar.bz2 81434151 RMD160 608abdb0095caad8552169ff255517949
 DIST linux-3.5-r1+sabayon.tar.bz2 82414827 RMD160 e1f07a1496a0b6c9d4dd6aa3d2a093ccfa5aaacc SHA1 0e7c4b65f864d26005fe39d2ab0196dc18c69709 SHA256 b24102642ad9f47d13507f5c7170231520ffff31f59ad70edcdf072b5c3a4831
 DIST linux-3.5-r2+sabayon.tar.bz2 82413462 RMD160 9c91c95d9b06884154c94c9983c74c30bbac5d81 SHA1 f66d209059353e0b1348c3319543515b9747a296 SHA256 96f0796c49b09197e371e32fdd7dfeb36d136cec12edfb6121c8d8e0ed48c812
 DIST linux-3.5-r3+sabayon.tar.bz2 82419132 RMD160 2efd55927429bda7ad5be8c494488ababc48d014 SHA1 d097d011fd137f027b837c1bc43582f704bad014 SHA256 6a2c1e6ade660d8be0aed46ce1fc4c9e9959fed4b9e6fbac4823a347de15988e
+DIST linux-3.5-r4+sabayon.tar.bz2 82419945 RMD160 1f3d463ba5ceaeba5273200c908fae2a94708812 SHA1 35b3a671618f5ebe7d334c2f9a29932ec007ab48 SHA256 8cb8b6518e859f3a9aa12d040989d69e335b4932944d81b6ca2851db76e705df
 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
@@ -87,4 +88,5 @@ EBUILD server-sources-3.4.ebuild 521 RMD160 3424c57d79d778cb117c990e5557b4e240aa
 EBUILD server-sources-3.5-r1.ebuild 521 RMD160 3424c57d79d778cb117c990e5557b4e240aa51cc SHA1 010647c35eab4fc2173287cddb8d32fd2da04468 SHA256 2774638173cc0d59fcb500249ba1cdbd413c0e343ac655f970145cb5b7469b36
 EBUILD server-sources-3.5-r2.ebuild 521 RMD160 3424c57d79d778cb117c990e5557b4e240aa51cc SHA1 010647c35eab4fc2173287cddb8d32fd2da04468 SHA256 2774638173cc0d59fcb500249ba1cdbd413c0e343ac655f970145cb5b7469b36
 EBUILD server-sources-3.5-r3.ebuild 521 RMD160 3424c57d79d778cb117c990e5557b4e240aa51cc SHA1 010647c35eab4fc2173287cddb8d32fd2da04468 SHA256 2774638173cc0d59fcb500249ba1cdbd413c0e343ac655f970145cb5b7469b36
+EBUILD server-sources-3.5-r4.ebuild 521 RMD160 3424c57d79d778cb117c990e5557b4e240aa51cc SHA1 010647c35eab4fc2173287cddb8d32fd2da04468 SHA256 2774638173cc0d59fcb500249ba1cdbd413c0e343ac655f970145cb5b7469b36
 EBUILD server-sources-3.5.ebuild 651 RMD160 b3f3a0d1831cdeb459f0c9ea8c110ee0c7e8ba1e SHA1 e3ad5462ae37c53fa4bcdb7718535370f02da9e6 SHA256 c85941f23990b9e6b7b13c5670e84a98b2fdb7f1aa84107f8bff6a720b0eca16
diff --git a/sys-kernel/server-sources/server-sources-3.5-r4.ebuild b/sys-kernel/server-sources/server-sources-3.5-r4.ebuild
new file mode 100644
index 000000000..17c599b9e
--- /dev/null
+++ b/sys-kernel/server-sources/server-sources-3.5-r4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 2004-2010 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+
+ETYPE="sources"
+K_SABKERNEL_SELF_TARBALL_NAME="sabayon"
+K_SABKERNEL_NAME="server"
+K_ONLY_SOURCES="1"
+K_SABKERNEL_FORCE_SUBLEVEL="0"
+inherit sabayon-kernel
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Official Sabayon Linux Server kernel sources"
+RESTRICT="mirror"
+IUSE="sources_standalone"
+
+DEPEND="${DEPEND}
+	sources_standalone? ( !=sys-kernel/linux-server-${PVR} )
+	!sources_standalone? ( =sys-kernel/linux-server-${PVR} )"