diff --git a/sys-kernel/pentoo-sources/Manifest b/sys-kernel/pentoo-sources/Manifest
index 1c030b54b..53822dfa0 100644
--- a/sys-kernel/pentoo-sources/Manifest
+++ b/sys-kernel/pentoo-sources/Manifest
@@ -4,9 +4,9 @@ DIST genpatches-5.4-51.extras.tar.xz 1768 BLAKE2B b464b9c9ac573b159211c51f9b131e
 DIST genpatches-5.7-17.base.tar.xz 725800 BLAKE2B e0afcde6b3db11ff2849d38eaada6388b47abcb578c94098cf88e3a3f17c5fd27738f5c31d3e6b426cce17c07f98651b275b4c5cd9fec42627dddec1aec576da SHA512 3c47c1cfe9b23d757b5cbc8ce631abf4ba831cdd13bd8390f51b00999f5b2fc41b66ecf719ac3bf5eeeb21ef62db042c652d42ed51548ee3b162d3c31a0ee79b
 DIST genpatches-5.7-17.experimental.tar.xz 14136 BLAKE2B 90f5c2133332c44e11e7634ae20b9b9a78c0aafc2bfe3a405cbb1d5187c33fc5a2fe63ed0771a53c12910875b9494bec79cffb8f345d68e5102a0a5c0c87cbad SHA512 b86e4b6e52ad590ba62b767a6fba7882e6b8a4cff555843e5e8b8c4237a20bbfaa701e3524811a49af597f93d8d49429f152ae966c8d42aa80a83275126c0e68
 DIST genpatches-5.7-17.extras.tar.xz 1764 BLAKE2B 465c96b1edde03c888199704fe87f18a9f6d6cdfc11051ed7e946248b524d0933c727f00cdfaa666c13ab077c934766783b512158fd61dff4352fa510cfb79f4 SHA512 9263e15efb146b059b0b864302238efd65780efab2dbe7094de40302bd800fabefd8d47bc904ccd6b433ce7d75865473f25c11f536933c94e44ade5cd1f0d38c
-DIST genpatches-5.8-10.base.tar.xz 347544 BLAKE2B 8cfcdd84b803b8dc1721166d853267267f16a4c6e6cf759bad5c34b6149a57e7f5bddc14b287b870df98ad2af93871b6bd1b5f9dff0308fde9a25115943d3bbe SHA512 40f07ddf0f852cbe79f7b2da289787090ace5cb478c21c41adb82726e22a404d7c35acd76dc73a7fb1444f6910735249667a79d8d756171e1b8ce9cfcbfbfdef
-DIST genpatches-5.8-10.experimental.tar.xz 14240 BLAKE2B cff77ac57b09e377f86547949afbc98cfe3204f8a136bab283e8615781129cd35fd26b6b1fde08b98d6aaf1991de2fd6a4a35918a1a6648da9dbe3d3f3463408 SHA512 f3ba66798b45943b028cfabbb68b02b13c83ac707a4695c6630c98dd9be8efcd086efde005c3a7e006a1bc2079b53af56f1a34f2710bf9105cfecb5ec1957369
-DIST genpatches-5.8-10.extras.tar.xz 1768 BLAKE2B 056c24f09a74c2867c767139fcd90af83623aac03e06ae03ebe96decfc4fccfc8b213f93e8b0cfda9bac935d85734c8968f590dd4537ba14f9daa0c249c257fd SHA512 aa1bc1d7f0190cded4d944cad3855358b26bc7dcfc726745da6ff8789662c5b74790284bf659ae8060280086e6b2809c903ce876f0c5b9c9d550a0123ada86af
+DIST genpatches-5.8-15.base.tar.xz 498912 BLAKE2B 429c079f836b9dc6d2086fe818f4e705264f002bcfcf4e5bdbe144af53aca53c8bfc1c0ac23aa33939bc59111e2194747088bbccff61015fd59ac0e3150aab62 SHA512 936414eaaa159a84bf016080332a8ba29c2024c02e5b83ed559df7b1a910ba405093e5ed36d54a346091a534f1389eba99b95852b23328a92e2f7ba5b07723ee
+DIST genpatches-5.8-15.experimental.tar.xz 6064 BLAKE2B d447307c194e9e62fff29e71b640730f16d0a88ce148a331d74cac74b1b4661ac2d4b4827f4e9c05edd25de2522e295c15d2a37ed62bed329fc8365cb8333afd SHA512 e6f4701e88cfde590d75bd8fc3954eed48e179bcc84704a4cc0b2ccd2379754a74a16d65355021de7c372571499a290d11d150624b1eeb91ea3170d038048565
+DIST genpatches-5.8-15.extras.tar.xz 1772 BLAKE2B 690935cb537f442dd48dea34000bc444b9c2861b259ebb156722f1027ba281111b037fafe4cfdb71e68c40603f2dcb27d2639d949d4e4fbada8811fce2716329 SHA512 8dcc4ebb194603036323dcc559b5827d02c6a678b2f162191e306fe6ae52cc860e651937962ac8b52e2a4e229b1326a2cb24f938638556b0ddf4369f140f997b
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
 DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
diff --git a/sys-kernel/pentoo-sources/files/config-amd64-5.8.7 b/sys-kernel/pentoo-sources/files/config-amd64-5.8.12
similarity index 99%
rename from sys-kernel/pentoo-sources/files/config-amd64-5.8.7
rename to sys-kernel/pentoo-sources/files/config-amd64-5.8.12
index 6e8b18343..1b389c78d 100644
--- a/sys-kernel/pentoo-sources/files/config-amd64-5.8.7
+++ b/sys-kernel/pentoo-sources/files/config-amd64-5.8.12
@@ -1,11 +1,11 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.8.7-pentoo Kernel Configuration
+# Linux/x86 5.8.12-pentoo Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Gentoo Hardened 9.3.0-r1 p3) 9.3.0"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=90300
-CONFIG_LD_VERSION=233010000
+CONFIG_LD_VERSION=234000000
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
@@ -6843,9 +6843,6 @@ CONFIG_HDMI=y
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
-CONFIG_VGACON_SOFT_SCROLLBACK=y
-CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256
-CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT=y
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
diff --git a/sys-kernel/pentoo-sources/files/config-amd64-latest b/sys-kernel/pentoo-sources/files/config-amd64-latest
index 0d8171d04..af135c13d 120000
--- a/sys-kernel/pentoo-sources/files/config-amd64-latest
+++ b/sys-kernel/pentoo-sources/files/config-amd64-latest
@@ -1 +1 @@
-config-amd64-5.8.7
\ No newline at end of file
+config-amd64-5.8.12
\ No newline at end of file
diff --git a/sys-kernel/pentoo-sources/files/config-x86-5.8.7 b/sys-kernel/pentoo-sources/files/config-x86-5.8.12
similarity index 99%
rename from sys-kernel/pentoo-sources/files/config-x86-5.8.7
rename to sys-kernel/pentoo-sources/files/config-x86-5.8.12
index 07862be6c..adcb4a107 100644
--- a/sys-kernel/pentoo-sources/files/config-x86-5.8.7
+++ b/sys-kernel/pentoo-sources/files/config-x86-5.8.12
@@ -1,11 +1,11 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.8.7-pentoo Kernel Configuration
+# Linux/x86 5.8.12-pentoo Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Gentoo Hardened 9.3.0-r1 p3) 9.3.0"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=90300
-CONFIG_LD_VERSION=233010000
+CONFIG_LD_VERSION=234000000
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
@@ -6661,9 +6661,6 @@ CONFIG_HDMI=y
 # Console display driver support
 #
 CONFIG_VGA_CONSOLE=y
-CONFIG_VGACON_SOFT_SCROLLBACK=y
-CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=128
-CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT=y
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
diff --git a/sys-kernel/pentoo-sources/files/config-x86-latest b/sys-kernel/pentoo-sources/files/config-x86-latest
index 70c25e64f..449f0d232 120000
--- a/sys-kernel/pentoo-sources/files/config-x86-latest
+++ b/sys-kernel/pentoo-sources/files/config-x86-latest
@@ -1 +1 @@
-config-x86-5.8.7
\ No newline at end of file
+config-x86-5.8.12
\ No newline at end of file
diff --git a/sys-kernel/pentoo-sources/pentoo-sources-5.8.7.ebuild b/sys-kernel/pentoo-sources/pentoo-sources-5.8.12.ebuild
similarity index 90%
rename from sys-kernel/pentoo-sources/pentoo-sources-5.8.7.ebuild
rename to sys-kernel/pentoo-sources/pentoo-sources-5.8.12.ebuild
index 37165a526..bf5889b1e 100644
--- a/sys-kernel/pentoo-sources/pentoo-sources-5.8.7.ebuild
+++ b/sys-kernel/pentoo-sources/pentoo-sources-5.8.12.ebuild
@@ -4,7 +4,7 @@
 EAPI="6"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="10"
+K_GENPATCHES_VER="15"
 
 inherit kernel-2
 detect_version
@@ -42,11 +42,11 @@ src_unpack() {
 src_install() {
 	kernel-2_src_install
 	insinto /usr/share/${PN}
-	if use amd64; then
-		doins "${FILESDIR}"/config-amd64-${PVR}
-	elif use x86; then
-		doins "${FILESDIR}"/config-x86-${PVR}
-	fi
+	#if use amd64; then
+	#	doins "${FILESDIR}"/config-amd64-${PVR}
+	#elif use x86; then
+	#	doins "${FILESDIR}"/config-x86-${PVR}
+	#fi
 }
 
 pkg_postinst() {