diff --git a/srcpkgs/nerd-fonts/template b/srcpkgs/nerd-fonts/template
index eebd5381e74..0fa7f3966e5 100644
--- a/srcpkgs/nerd-fonts/template
+++ b/srcpkgs/nerd-fonts/template
@@ -1,31 +1,55 @@
 # Template file for 'nerd-fonts'
 pkgname=nerd-fonts
-version=3.0.2
-revision=2
+version=3.1.1
+revision=1
+build_wrksrc="nerd-fonts-${version}"
 depends="nerd-fonts-ttf nerd-fonts-otf"
 short_desc="Iconic font aggregator, collection and patcher"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MIT"
 homepage="https://nerdfonts.com"
 changelog="https://raw.githubusercontent.com/ryanoasis/nerd-fonts/master/changelog.md"
-distfiles="https://github.com/ryanoasis/nerd-fonts/archive/refs/tags/v${version}.tar.gz"
-checksum=3b18b305451b0b22cb6484197f8029efe54e5c459e8ed3adbb0fb1697c0c13a6
+distfiles="https://github.com/ryanoasis/nerd-fonts/archive/refs/tags/v${version}.tar.gz
+ https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/0xProto.tar.xz
+ https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/CascadiaMono.tar.xz
+ https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/CommitMono.tar.xz
+ https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/D2Coding.tar.xz
+ https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/GeistMono.tar.xz
+ https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/IntelOneMono.tar.xz
+ https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/IosevkaTermSlab.tar.xz
+ https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/MartianMono.tar.xz
+ https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/Monaspace.tar.xz"
+checksum="4c4d7f2aceda05ff17789adb2c7046972f4729bc785bc85fd08d0ffde8785e5f
+ 4c69fe95a7e53feebef29e321d6ed4a4e0c91ad969d8f6ac8ccc66fc6f510528
+ e5a0d7ade7f8d85ed55dea69123598646efe7b45955e283c279197b5a9a0c884
+ 000e052e6112aec08ae6f6a59bf668772f89046758941cca126ec9dfc8915601
+ 42b66c2c74a4f99f5c069ddd26b3ac6829c85d4f54b857af269cbe1220c48a89
+ 01d249e0f572346fa5a734db27301a003cd94d75202c382be398c8c63b4a9025
+ 41f414b484318c3f67bb83b2709c1a148ad5d44348fd761e8a408b25d17ce41f
+ 57895e55ab3469281f532be362ed3b790f42580005abe3c164c9805d147cc46d
+ ee9cf10b84b62025e16904faf90f65f422d628317d410097e544bdfda66479ad
+ 004b4e08b1c7d1a8a3a1bf990ef29969714521cdb7d7a07c45f229617f2ae876"
+
+post_extract() {
+	# move fonts that haven't been renamed
+	for font in 0xProto CommitMono D2Coding GeistMono IosevkaTermSlab MartianMono; do
+		mv "${font}"* "nerd-fonts-${version}/patched-fonts/${font}/"
+	done
+	# move fonts that were renamed
+	mv CaskaydiaMono* "nerd-fonts-${version}/patched-fonts/CascadiaMono/"
+	mv IntoneMono* "nerd-fonts-${version}/patched-fonts/IntelOneMono/"
+	mv Monaspice* "nerd-fonts-${version}/patched-fonts/Monaspace/"
+}
 
 do_install() {
 	vmkdir usr/share/fonts/NerdFonts/otf
 	vmkdir usr/share/fonts/NerdFonts/ttf
-	vmkdir usr/lib/NerdFonts
 
 	# get all patched fonts
 	find patched-fonts -name '*.otf' -exec install -Dm644 '{}' "${DESTDIR}/usr/share/fonts/NerdFonts/otf" \;
 	find patched-fonts -name '*.ttf' -exec install -Dm644 '{}' "${DESTDIR}/usr/share/fonts/NerdFonts/ttf" \;
 	rm "${DESTDIR}"/usr/share/fonts/NerdFonts/ttf/SymbolsNerdFont*.ttf
 
-	# install patching scripts
-	for sh in bin/scripts/lib/i_*.sh; do
-		vinstall "$sh" 744 usr/lib/NerdFonts
-	done
-
 	vlicense LICENSE
 }