diff --git a/mupdf/.signature b/mupdf/.signature
index 98cb38483..732043585 100644
--- a/mupdf/.signature
+++ b/mupdf/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/YZQENpLaI9TOVyhnadeCrgzlX6rf+bKwlvupYVXVwdTQE8YE03++O5K8kTDdrmP7sm4qnGuI7E+eHPsozRjZQo=
-SHA256 (Pkgfile) = 67f636d92ce9acd5b0ce168de8a96e361354645a0ac2ffdd09918ab50ea36d93
+RWSE3ohX2g5d/WnR0bRAE01hLM0xcO1IczdeNi65tHjjbtl9tP2J7kAl7wn4nHUcNaExD/PbHwW3/Y1DOXWilZydvTql8YabkwU=
+SHA256 (Pkgfile) = 1c6d2eee88d55235257b4205b14ee95ccb588723885155cf629abc139e280d80
 SHA256 (.footprint) = 0e2b0f9ad16465ceb19642c1492382f22b9a508eaa0537864a1adc694f622ab3
 SHA256 (mupdf-1.20.0-source.tar.lz) = 68dbb1cf5e31603380ce3f1c7f6c431ad442fa735d048700f50ab4de4c3b0f82
diff --git a/mupdf/Pkgfile b/mupdf/Pkgfile
index b6ba1e8ec..78ecaffe5 100644
--- a/mupdf/Pkgfile
+++ b/mupdf/Pkgfile
@@ -2,25 +2,27 @@
 # URL: https://www.mupdf.com/
 # Maintainer: Juergen Daubert, jue at crux dot nu
 # Depends on: glu libglvnd harfbuzz libjpeg-turbo xorg-libxi
+# Optional: freeglut openjpeg2 jbig2dec gumbo-parser
 
 name=mupdf
 version=1.20.0
-release=1
+release=2
 source=(https://mupdf.com/downloads/archive/$name-$version-source.tar.lz)
 
 build() {
 	cd $name-$version-source
 
-	export USE_SYSTEM_LIBS='yes'
+	PKGMK_MUPDF="USE_SYSTEM_LIBS=yes"
 
-	make install \
+	prt-get isinst freeglut || PKGMK_MUPDF+=" USE_SYSTEM_GLUT=no"
+	prt-get isinst openjpeg2 || PKGMK_MUPDF+=" USE_SYSTEM_OPENJPEG=no"
+	prt-get isinst jbig2dec || PKGMK_MUPDF+=" USE_SYSTEM_JBIG2DEC=no"
+	prt-get isinst gumbo-parser || PKGMK_MUPDF+=" USE_SYSTEM_GUMBO=no"
+
+	make install $PKGMK_MUPDF\
 		prefix=$PKG/usr \
 		mandir=$PKG/usr/share/man \
-		XCFLAGS="-fpic -fcommon" \
-		USE_SYSTEM_JBIG2DEC='no' \
-		USE_SYSTEM_OPENJPEG='no' \
-		USE_SYSTEM_GLUT='no' \
-		USE_SYSTEM_GUMBO='no'
+		XCFLAGS="-fpic -fcommon"
 
 	ln -s mupdf-gl $PKG/usr/bin/mupdf
 	rm -r $PKG/usr/share/doc