diff --git a/sys-kernel/linux-sabayon/Manifest b/sys-kernel/linux-sabayon/Manifest
index 3af18cd2c..37e7f15bf 100644
--- a/sys-kernel/linux-sabayon/Manifest
+++ b/sys-kernel/linux-sabayon/Manifest
@@ -76,4 +76,4 @@ EBUILD linux-sabayon-3.4-r5.ebuild 356 RMD160 9e1930ed6676c73512567b2da40c45632c
 EBUILD linux-sabayon-3.4-r6.ebuild 356 RMD160 9e1930ed6676c73512567b2da40c45632c6da80c SHA1 153c4bcbf9a16119af84e772ee5b24eaaf4d07df SHA256 f3b3e2c4d19bdaafe9438c2e215c3a03fd022115f14012874ce8355acf27489c
 EBUILD linux-sabayon-3.4.ebuild 356 RMD160 9e1930ed6676c73512567b2da40c45632c6da80c SHA1 153c4bcbf9a16119af84e772ee5b24eaaf4d07df SHA256 f3b3e2c4d19bdaafe9438c2e215c3a03fd022115f14012874ce8355acf27489c
 EBUILD linux-sabayon-3.5-r1.ebuild 356 RMD160 9e1930ed6676c73512567b2da40c45632c6da80c SHA1 153c4bcbf9a16119af84e772ee5b24eaaf4d07df SHA256 f3b3e2c4d19bdaafe9438c2e215c3a03fd022115f14012874ce8355acf27489c
-EBUILD linux-sabayon-3.5.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.ebuild b/sys-kernel/linux-sabayon/linux-sabayon-3.5.ebuild
index cfdc8ce73..be28d33d2 100644
--- a/sys-kernel/linux-sabayon/linux-sabayon-3.5.ebuild
+++ b/sys-kernel/linux-sabayon/linux-sabayon-3.5.ebuild
@@ -10,3 +10,8 @@ inherit sabayon-kernel
 KEYWORDS="~amd64 ~x86"
 DESCRIPTION="Official Sabayon Linux Standard kernel image"
 RESTRICT="mirror"
+
+src_unpack() {
+	sabayon-kernel_src_unpack
+	sed -i "s:CONFIG_AUFS_FS=m:CONFIG_AUFS_FS=y:" "${S}"/sabayon/config/*.config || die
+}
diff --git a/sys-kernel/linux-server/Manifest b/sys-kernel/linux-server/Manifest
index b8cbbd0fe..28277ed97 100644
--- a/sys-kernel/linux-server/Manifest
+++ b/sys-kernel/linux-server/Manifest
@@ -79,4 +79,4 @@ EBUILD linux-server-3.4-r5.ebuild 409 RMD160 7f6ed40be8f29f4a5dd68ba7c0236acc25f
 EBUILD linux-server-3.4-r6.ebuild 409 RMD160 7f6ed40be8f29f4a5dd68ba7c0236acc25fb0619 SHA1 bc6fea68ad1027a45fe85fd8ff95b61ece41d6f4 SHA256 8f4e01790cd551947a4fa6fcf60a1caa4e104077d8d82f764f75528a0d6c483b
 EBUILD linux-server-3.4.ebuild 409 RMD160 7f6ed40be8f29f4a5dd68ba7c0236acc25fb0619 SHA1 bc6fea68ad1027a45fe85fd8ff95b61ece41d6f4 SHA256 8f4e01790cd551947a4fa6fcf60a1caa4e104077d8d82f764f75528a0d6c483b
 EBUILD linux-server-3.5-r1.ebuild 409 RMD160 7f6ed40be8f29f4a5dd68ba7c0236acc25fb0619 SHA1 bc6fea68ad1027a45fe85fd8ff95b61ece41d6f4 SHA256 8f4e01790cd551947a4fa6fcf60a1caa4e104077d8d82f764f75528a0d6c483b
-EBUILD linux-server-3.5.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.ebuild b/sys-kernel/linux-server/linux-server-3.5.ebuild
index 3faea4fda..59a6d6e96 100644
--- a/sys-kernel/linux-server/linux-server-3.5.ebuild
+++ b/sys-kernel/linux-server/linux-server-3.5.ebuild
@@ -10,3 +10,8 @@ inherit sabayon-kernel
 KEYWORDS="~amd64 ~x86"
 DESCRIPTION="Official Sabayon Linux Server kernel image"
 RESTRICT="mirror"
+
+src_unpack() {
+	sabayon-kernel_src_unpack
+	sed -i "s:CONFIG_AUFS_FS=m:CONFIG_AUFS_FS=y:" "${S}"/sabayon/config/*.config || die
+}
diff --git a/sys-kernel/sabayon-sources/Manifest b/sys-kernel/sabayon-sources/Manifest
index 69babc4e0..3da05ac68 100644
--- a/sys-kernel/sabayon-sources/Manifest
+++ b/sys-kernel/sabayon-sources/Manifest
@@ -76,4 +76,4 @@ EBUILD sabayon-sources-3.4-r5.ebuild 556 RMD160 f5e82498df737f94fd0ee6dc4d719f0d
 EBUILD sabayon-sources-3.4-r6.ebuild 556 RMD160 f5e82498df737f94fd0ee6dc4d719f0d333aae9c SHA1 d3ed4c24f8b820840b4caaba92b8bf9ca91de4a1 SHA256 7ce9a2e2f5165a08bb2276be9b653144d58114fb77dc5bc43c6bbc112cca2462
 EBUILD sabayon-sources-3.4.ebuild 556 RMD160 f5e82498df737f94fd0ee6dc4d719f0d333aae9c SHA1 d3ed4c24f8b820840b4caaba92b8bf9ca91de4a1 SHA256 7ce9a2e2f5165a08bb2276be9b653144d58114fb77dc5bc43c6bbc112cca2462
 EBUILD sabayon-sources-3.5-r1.ebuild 556 RMD160 f5e82498df737f94fd0ee6dc4d719f0d333aae9c SHA1 d3ed4c24f8b820840b4caaba92b8bf9ca91de4a1 SHA256 7ce9a2e2f5165a08bb2276be9b653144d58114fb77dc5bc43c6bbc112cca2462
-EBUILD sabayon-sources-3.5.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.ebuild b/sys-kernel/sabayon-sources/sabayon-sources-3.5.ebuild
index 47e1bf8c6..e9604efee 100644
--- a/sys-kernel/sabayon-sources/sabayon-sources-3.5.ebuild
+++ b/sys-kernel/sabayon-sources/sabayon-sources-3.5.ebuild
@@ -17,3 +17,8 @@ DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-sabayon-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-sabayon-${PVR} )"
 
+
+src_unpack() {
+	sabayon-kernel_src_unpack
+	sed -i "s:CONFIG_AUFS_FS=m:CONFIG_AUFS_FS=y:" "${S}"/sabayon/config/*.config || die
+}
diff --git a/sys-kernel/server-sources/Manifest b/sys-kernel/server-sources/Manifest
index 1edbe5d3a..e26ef1291 100644
--- a/sys-kernel/server-sources/Manifest
+++ b/sys-kernel/server-sources/Manifest
@@ -83,4 +83,4 @@ EBUILD server-sources-3.4-r5.ebuild 521 RMD160 3424c57d79d778cb117c990e5557b4e24
 EBUILD server-sources-3.4-r6.ebuild 521 RMD160 3424c57d79d778cb117c990e5557b4e240aa51cc SHA1 010647c35eab4fc2173287cddb8d32fd2da04468 SHA256 2774638173cc0d59fcb500249ba1cdbd413c0e343ac655f970145cb5b7469b36
 EBUILD server-sources-3.4.ebuild 521 RMD160 3424c57d79d778cb117c990e5557b4e240aa51cc SHA1 010647c35eab4fc2173287cddb8d32fd2da04468 SHA256 2774638173cc0d59fcb500249ba1cdbd413c0e343ac655f970145cb5b7469b36
 EBUILD server-sources-3.5-r1.ebuild 521 RMD160 3424c57d79d778cb117c990e5557b4e240aa51cc SHA1 010647c35eab4fc2173287cddb8d32fd2da04468 SHA256 2774638173cc0d59fcb500249ba1cdbd413c0e343ac655f970145cb5b7469b36
-EBUILD server-sources-3.5.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.ebuild b/sys-kernel/server-sources/server-sources-3.5.ebuild
index 17c599b9e..73df2583f 100644
--- a/sys-kernel/server-sources/server-sources-3.5.ebuild
+++ b/sys-kernel/server-sources/server-sources-3.5.ebuild
@@ -15,3 +15,8 @@ IUSE="sources_standalone"
 DEPEND="${DEPEND}
 	sources_standalone? ( !=sys-kernel/linux-server-${PVR} )
 	!sources_standalone? ( =sys-kernel/linux-server-${PVR} )"
+
+src_unpack() {
+	sabayon-kernel_src_unpack
+	sed -i "s:CONFIG_AUFS_FS=m:CONFIG_AUFS_FS=y:" "${S}"/sabayon/config/*.config || die
+}