diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index a82709a7bcf0..584e54522367 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -10,7 +10,7 @@ DIST NVIDIA-Linux-x86_64-470.256.02.run 272850014 BLAKE2B 0fdc867f92b82b2a60810c
 DIST NVIDIA-Linux-x86_64-535.274.02.run 341804470 BLAKE2B 0d848295d8f0f8fe3b4ab6c0204bfc3ac26f75df253b6595137e99177e4ccd490e0c8d4330f6789137d906fdec317033e59b5f22213a38ef3c9daae2968f71b8 SHA512 cc89f84c4f8d76d8d1532e67630426b3988e778bc7474059231971333cd81d6a552d8f5ca329f9e3c540229bbc247b665d2276298e3c302975ab0f0562ddaafb
 DIST NVIDIA-Linux-x86_64-570.207.run 376235013 BLAKE2B 76d2092705673d743f2e64136d2073de2004ea71b3fdde7dd0ae1e11fd5f1e0dd5174324589f2386dadb85c2d2992b62229575b0cf33b20137aab16d51b0c566 SHA512 587ed8a274af0a9a3f029951a1a86a16e1ab367c07e8eb928d17e0d4ad79f13700a9aef0b3a42bae9d14a832141e9b02b117636b12788b58364430335bff9167
 DIST NVIDIA-Linux-x86_64-580.119.02.run 397786077 BLAKE2B 2a57a0c53deaa1d31c3bb1ca53f05ab017cccdbdd95a99748997d2988359c9ff4f2cb824304b75e4288801f0882deeaef9712785b4e1c659282c25d610be089a SHA512 b773deaa58823d3907488527507df6831959c1b8215ad34e1fdf7025d318d9ca7610d0b103252252c4e4097ec97d4224f99a3e9701327dc15eadc66e906af250
-DIST NVIDIA-Linux-x86_64-580.94.11.run 398175670 BLAKE2B 77a4bfb1d1bfb31f7051a21373a5f5a98d31d741af4632256f08914b5c7289ae4f17d5b4569a46e8d0623ca5a22611bd67fb1c608634534b25d7b772fc85e395 SHA512 6251ec2f9921b392c7a0428b56f35dcaf787c0efd12d2201ce20fd3b41701674c3fd36efb14f7ddf6653b762f1973857b33eb093305546ab2bd8de29ce7bd92f
+DIST NVIDIA-Linux-x86_64-580.94.13.run 398047606 BLAKE2B 9261ecf5c4586a22656219a1cc4e56966f0eb431c21b5238a0f6bab0a9691781cc5b879708d9e0afaf726db9e70f63c62948298c3fc7161a7f9e9f5a9d4cce46 SHA512 b64176d9729e8b237c9e982e07e12fde4dad8f4b3ee1cf73447eedb0566a4beb6417ac5a5f97744ba6b32f48c8d5d22b1076de0375bdcb0f53c4c6724aea494a
 DIST NVIDIA-Linux-x86_64-580.95.05.run 396658958 BLAKE2B 7e23e5243023de357329f8f57b65a386306fd898a78c68b01d67a9572ac0d64b2d87c0cf3265c23fc4c13192d92060196ee173c34cb485a693035478cb3fc82e SHA512 21e8076f593ce255c8e96dd456524f700e76b230130659ed73a279432dd9f2aa60735411c6fc906e9f60882e905cc1c5b91aaf80d5d5e64d317b1dd27f6e4c13
 DIST NVIDIA-Linux-x86_64-590.44.01.run 416205886 BLAKE2B b8a4f02ce1b3697f45d5932606a8d9816e8dd38e4957b0d069f9759cacffb42fb741084009c012017e92a785fe9ff3810d7fd420f832873a2c890c7e29d5acd5 SHA512 8fb0cd0b09b3b997029e97314fb8b4f63a5b567c17d99b63321e72b3e002c5e912694c5049babae80e7eafdbcc966d46e50bb942ddefe3e9da28623b5b119005
 DIST NVIDIA-Linux-x86_64-590.48.01.run 416273526 BLAKE2B 57bc232f3d5cc52b3ba7c097e5c04b0e128947b34f75c8c7a75135ebbdda565dd9ae829f3707cfef35a9b8b554f2b46a50756f6b256a0f0280c22cf9ecefb2e1 SHA512 31fd82af707dbe9a6d3848766925386f5e91c5fae0a605819450eb8e5a5a52eaab3ae5cff50b4dd36bc5c32fe1aabc29a6a79438d6614988c7b08f509ef0da6d
@@ -60,4 +60,4 @@ DIST nvidia-xconfig-580.119.02.tar.bz2 111561 BLAKE2B 8e23563e05168de19f616c2fa7
 DIST nvidia-xconfig-580.95.05.tar.bz2 111488 BLAKE2B abaf3fa63c19129df539a1e0eb4466ff7b8ccf81527c69b6bcfb16df2abf0950541791ecca130ff59ec0028a5a92c1a0912bc1d35a48efbd331a58f224699db6 SHA512 4fa0d411e8c41ee5f24443ef9f88a261c006b5b487f6745d54eac27805a8a810ef5ffba1da3952a39978e1ccfe39114399722e392d282791a648c69a88b7777e
 DIST nvidia-xconfig-590.44.01.tar.bz2 111036 BLAKE2B a8108784699b6b8e507a916152a2a02918db4da1f0ee24d4e31dbd1de779bef910f69fbfe0414df33d58b0ca1656f2d9a6fd4796c472078b5d919a14dd0b42ff SHA512 85b64c0fe5d6633b3aa95276f521b828b98278376b5be428080e257752332618867ded6805e8b50cbe9331bc4dd9fbdbdfd3c29e46fed1da890a993acbb3f613
 DIST nvidia-xconfig-590.48.01.tar.bz2 110986 BLAKE2B 6ec7f5eee2ca4c4a96f0607ac94ec3d491137a0e8750a6ae4c46feddced61f7a8b1eb77aa333008a69ceab7ad071671b7449bb2ed9ba285359fd1cb991a9c9b2 SHA512 e85dbd9ba5e056fb6f8a4618df35fa1692d0037e50122a5659ebda043a9b380fdf72aaa56f82b64e5525c36f429ed9bbd7f0e319c608f7c50355d47ab3b24077
-DIST open-gpu-kernel-modules-580.94.11.tar.gz 23281320 BLAKE2B 2eabb58ae6bce6e13469d91337f4ea2f5ed1f779a2687be01a6d3c2ef36c2aa6d4a0629296f48cf9fd2421ea06bda30f03c3af66c357dcfd41c2eee62e84d4b4 SHA512 305e6ed817bf42ab3fc2dd26000aaf92ce21d6aa44176f4d48905094c77c50636646dc0cc933ce994f4a9566cef8674af56b8fc365a9f27b4a9793be9fc3909c
+DIST open-gpu-kernel-modules-580.94.13.tar.gz 23297773 BLAKE2B e694d81d489de376664d3e3afac2c127b4bac9db0a255f04a1a4b48ecdbf52e23d6523230ece371a30beb4699425d30f8c627bcf8c33214f87f46eddf18922c7 SHA512 03b150cc425f23bc9f567ab731a139379508e1368ed2ea7323ec9ab5fbc91839fede00dadbaf5c21ba2c3f0ffb5cafde0bc7871db1512838dd8b8f85c3a5fad2
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-580.94.11.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-580.94.13.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-580.94.11.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-580.94.13.ebuild
index 8f3ef433ab3a..f3d232db2c63 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-580.94.11.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-580.94.13.ebuild
@@ -101,7 +101,6 @@ QA_PREBUILT="lib/firmware/* usr/bin/* usr/lib*"
 PATCHES=(
 	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
 	"${FILESDIR}"/nvidia-settings-530.30.02-desktop.patch
-	"${FILESDIR}"/nvidia-kernel-module-source-580.95.05-kernel6.18.patch
 )
 
 pkg_setup() {