diff --git a/sys-kernel/pentoo-sources/Manifest b/sys-kernel/pentoo-sources/Manifest
index 416608726..954495342 100644
--- a/sys-kernel/pentoo-sources/Manifest
+++ b/sys-kernel/pentoo-sources/Manifest
@@ -7,9 +7,9 @@ DIST genpatches-5.2-14.extras.tar.xz 1724 BLAKE2B bdf4f9b0c6ec641ee1dc5daa355202
 DIST genpatches-5.3-21.base.tar.xz 657548 BLAKE2B 9a2c4bd99381d1f70af24aa3088b65bd4e5926a3d26c279faecb3e36f82439cf37b83e6ef5d376d56c88ee61839fe18ccc7da4f4879924c3ca9ee46c2e03af3c SHA512 760afbf6106d3630a56aea8178cb62a0739526209786d5d90b9fdda82f71ac75c0d7bbdca2bfe8b165a6fd089262c771f126799bd1d3eba66107ffd6bc7ecf9a
 DIST genpatches-5.3-21.experimental.tar.xz 6148 BLAKE2B 7b5dfddf08f8a9b0a48a11bb3dd684103f5d9c88ab22128043cf369f451028fc1cf69ff7531c166495385638506942ef2b5806b836dfdce7aefb965a11d2d39e SHA512 5a1d291b669c3910501ccdab16e7a389230d15213ff2974c74141c15fcac9fdf8d6b54149296ee826fc3e4d7b8ef69a30456c53442e400155cf46ec253728db1
 DIST genpatches-5.3-21.extras.tar.xz 1736 BLAKE2B f3269248772d7f436a86b810740928f19e7a1da76e7c09e2c19b9bb492238a270c3b06ac9d4c5b33ba236692ab3703b0aee6c9e600f2b8e8ba2824e9a7764e0f SHA512 47014172299e6ebbc835c7fbbe8cab4f468f676b667c1bceb9f281f40fee1e4435f4b6b8b817f8751c379b57fe34e3cfd2f9b7ba0c64276f5acf2cba89f32c42
-DIST genpatches-5.4-13.base.tar.xz 505168 BLAKE2B bf428eef66887c47006dd9713d7b5ffc4ed508d2d9a4e5a8f81eec5d39953779067307b30f5c2a94be047a1f7e149b02df8bfaebba9674474e3e44b4501c86db SHA512 e5690f03ea20f250443f9ff4857bd9c104637dfb4df15615841843035eca7283a4c12380db78cb7f6f9e3cc772a6d256d00584ad26ed72afe4706d3365ff2dcd
-DIST genpatches-5.4-13.experimental.tar.xz 6140 BLAKE2B 77e6cb75a76755626195a4744cd80a6be896dce3a236b5296df197ba5b2de39d2c6f13ce51579eb43e383cee460274e34e50b354e6b1dea6a2211594332f89a9 SHA512 bb261b1a477c491cb6f0b92ea4098655cd1deb7fe704db9a36c536764b8c1b643dbf0e351610f46737f8721b7110af2ca8493c1c2e45848177a44e8244084843
-DIST genpatches-5.4-13.extras.tar.xz 1744 BLAKE2B 44af74d2ccb864674909ba913cce68a64bdd20d83ef8241df30d5140d0fcf704b28360709b3b1314832cc58589504cf416949ed468af603ae572e41da9d2b998 SHA512 e9a00184a5b5658fcc6a4207de67e6141048baea34b91a728f0c4c596f437873650772688c3e2d1a2f2bd7c3e2dce92cf60d4b76802f0b389a7996538aae2600
+DIST genpatches-5.4-15.base.tar.xz 586668 BLAKE2B 6e363fc484e94c2903ea94d5966d311f7bc99dba2395b47075f4e553dcb437184036b4651f97d943d3ddb6016a74d9692723fd4b86c4b0272f2c9dd3ae657cfd SHA512 ff31fbb8e71b2bccb4e99a15127b2392d4e4f3452a522cd49b1b9aaa0916e35e32ae41c62a2cb896951312d756cda89533b2a4c79da8bff53a8d448919fb9ecd
+DIST genpatches-5.4-15.experimental.tar.xz 6140 BLAKE2B 03408c287c90b7e77ee132ae7d0dbbbc6791bc26ed75dd1eb88009e7892c02db5621b98b40013c9da420577b5a6eada7b4cd49b43a4d41c0bb69bbd15b34ce8a SHA512 8039f604515a57207a69464d9dd12d4481daeb089532208cbce0fb9d0722e67ba940433af52d6ebe0e5b701ddff964f03fc142b273d29626afe87233e40db6dc
+DIST genpatches-5.4-15.extras.tar.xz 1744 BLAKE2B bca6af0367819405e5d11c46bcd45187ea16b0de7793e546d4be294a3c87e5e00313873d356c3139881f619fa6e64da0c99f8a8b788ec14e17c1ca192276c543 SHA512 2f783d62403997d724ff4e124f9365dbddd3f139438b6bec608829762a3b2ef29dc8c488b10a4069a501de70512cff15dbb187d44c8ec90ff0604bc63a713420
 DIST linux-5.1.tar.xz 106244476 BLAKE2B ae3c63ced819737e34f8ec3a78138f87704a2f2956454411e3a4830ec8c0aaf2c288af6ca080f1892540e50f4a422482360010be8641afdeeeaf7231e7d8da97 SHA512 ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
 DIST linux-5.2.tar.xz 107029708 BLAKE2B f0cf6e3a15a4bd019edbfa33cb4556d0672e807f7d139eff3ab053d0ad7649198b229475955a1f51eb90d0e9f8268cafb782f6312793fdf38472f3c6d7c2d7ee SHA512 5a28f8a34c4e0470617f5638b7112e6252109b78f23b1eed484a228530970c7ef5c130d6e5a09cf25ea2f6a0329602dcc1ec66ce893182e15b27d99bd228789c
 DIST linux-5.3.tar.xz 108558876 BLAKE2B 0d08eed879d05734e4542f0c93823d43f8dc042a54ba5268064c4bbebd7a9d59c03abf3ad5dee8280e784ae148a3b0c56181eaf2d5b3c079b6fe9f5191544df6 SHA512 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d
@@ -17,6 +17,5 @@ DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6
 DIST penpatches-4.13.8-1.tar.xz 16424 BLAKE2B 005e83f5e667bd851c21a52929fd6ffa9458692eda285fd82fd145f91de7a49f1a7ed750b08979be230349435d07e23939b804b509849bb545de3a7631e11ee7 SHA512 b6d83edc0e97202dd4332eedf734a2024057fa9acd111394cc95a85d648bcc9d4f4d9ae9d84f3a63265146d9ba45f2470c0962c06c911be86da4dc7034b03dda
 DIST penpatches-5.2.1-1.tar.xz 16748 BLAKE2B 69f72d23eefd1e54ed27d0fdbabd558e3d7811941f04fd0970465ddcf612cdb3286e3c515399e325cd78fe883effe1ba27ae305753c69fc0469d477054b2b705 SHA512 27027697dcc2d9af18bfe0fc0280edaae124a0827103b7199d04a578c0682252222cad3489b995613959a58afef953dfb95871b97f4634b77bd73abb1b9d01f6
 DIST penpatches-5.3.8-1.tar.xz 19384 BLAKE2B 77317f4eeb6813bd0c5e517c4af4e3c2d9705019feb3ee64a8f3f4f4de148b0313db91273da5495020b6dbf2d9ca9031447568060a66c033b207be36dc067a1b SHA512 d1b0888f3c73afed2e188277846144368a4a49069d4fc9143c5322af4020c6942b56f92e0ccef9f6835551c21a460d4090d96ce5154684e1f441fea332f99455
-DIST penpatches-5.4.13-0.tar.xz 17596 BLAKE2B 02868e11d68bdd56171b89605ada82bc3823b6fde42c798369df8ffd646e0c96e3a97897fad7449e5bbae0a34f03a1c786bb28274ac721c0e1df92f9627f5806 SHA512 03140a7b22668015aedd03314e7b04ea26fa34d3fdce96c93e8e5b6f61c87b736c267062cbfce907458b272e1787270604142408992f5b8f0f5fcbc5e2bc1bf3
 DIST penpatches-experimental-5.3.8-2.tar.xz 11440 BLAKE2B 355130e766c6c44fd7136d8495602f3a36e2b7617334dcf6af3308263b8a13524210772a9d55236a60e034ff25a3bb4355a3b6f24bfe31d97d33316cffebfc08 SHA512 e4c555f49b74d2f083c4ca8d6fd7c88315b88ef4cbba93ec9c1c25ff0f0c35885abb7e38d1eaefbd2d1994e1f27f8d15db374290697e88ef05255e9eb43022d6
 DIST v2-kconfig-add-hardened-defconfig-helpers.patch 42021 BLAKE2B 4d0c1707a9d7e1c04411645c0cd6e8ebbb7fd88a477af5de67752bdd508c91e9bdfbff0831d1ace291e6e6b539617febbb56d11960a5d7c5411ed69fb92bfac2 SHA512 199cbfc7b6f96442c14f2c480bc7d2d3714edd0888e5d2aadbb3665a7da24b87822647cf93cc3b0900b225cbfd2e0b2b92db936107c49831b00b8df859ba109e
diff --git a/sys-kernel/pentoo-sources/pentoo-sources-5.4.13.ebuild b/sys-kernel/pentoo-sources/pentoo-sources-5.4.15.ebuild
similarity index 80%
rename from sys-kernel/pentoo-sources/pentoo-sources-5.4.13.ebuild
rename to sys-kernel/pentoo-sources/pentoo-sources-5.4.15.ebuild
index f9272bd00..dd969780d 100644
--- a/sys-kernel/pentoo-sources/pentoo-sources-5.4.13.ebuild
+++ b/sys-kernel/pentoo-sources/pentoo-sources-5.4.15.ebuild
@@ -4,29 +4,32 @@
 EAPI="6"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="13"
+K_GENPATCHES_VER="15"
 
 inherit kernel-2
 detect_version
 detect_arch
 
 #nvidia doesn't have a release for x86 that supports >4.17 yet, so now we give up on them
-#KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86"
 HOMEPAGE="https://github.com/pentoo/pentoo-livecd/tree/master/kernel/"
 IUSE="experimental pax_kernel pentoo-experimental"
 
 DESCRIPTION="Pentoo kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
 
 #normal penpatches
-PENPATCHES_VER="0"
-PENPATCHES="penpatches-5.4.13-${PENPATCHES_VER}.tar.xz"
-#PENPATCHES_URI="https://dev.pentoo.ch/~zero/distfiles/${PENPATCHES}"
-PENPATCHES_URI="https://dev.pentoo.ch/~blshkv/distfiles/${PENPATCHES}"
+PENPATCHES_VER="1"
+PENPATCHES="penpatches-5.3.8-${PENPATCHES_VER}.tar.xz"
+PENPATCHES_URI="https://dev.pentoo.ch/~zero/distfiles/${PENPATCHES}"
 #experimental penpatches
 PENPATCHES_EXP_VER="2"
 PENPATCHES_EXP="penpatches-experimental-5.3.8-${PENPATCHES_EXP_VER}.tar.xz"
 PENPATCHES_EXP_URI="https://dev.pentoo.ch/~zero/distfiles/${PENPATCHES_EXP}"
+
 SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${PENPATCHES_URI} ${PENPATCHES_EXP_URI}"
+
+#these three got merged
+UNIPATCH_EXCLUDE="4001-mt76-mt76u-rely-on-usb_interface-instead-of-usb_dev.patch 4006_mt76-mt76x0u-add-support-to-TP-Link-T2UHP.diff 4007_v2-cfg80211-use-parallel_ops-for-genl.patch"
 UNIPATCH_LIST="${DISTDIR}/${PENPATCHES}"
 
 pkg_setup() {