diff --git a/app/text/docbook-xml/docbook-xml.sysconf b/app/text/docbook-xml/docbook-xml.sysconf
new file mode 100644
index 00000000..36422866
--- /dev/null
+++ b/app/text/docbook-xml/docbook-xml.sysconf
@@ -0,0 +1,25 @@
+#!/bin/bash
+if [ -e /var/lib/ymp/sysconf/docbook-xml/postinstall.done ] ; then
+    exit 0
+fi
+if [ -e /etc/xml/catalog.preserve ]; then
+    mv /etc/xml/catalog.preserve /etc/xml/catalog
+elif [ ! -e /etc/xml/catalog ]; then
+    xmlcatalog --noout --create /etc/xml/catalog
+fi
+xmlcatalog --noout --add "delegatePublic" \
+    "-//OASIS//ENTITIES DocBook XML" \
+    "file:///etc/xml/docbook-xml" \
+    /etc/xml/catalog
+xmlcatalog --noout --add "delegatePublic" \
+    "-//OASIS//DTD DocBook XML" \
+    "file:///etc/xml/docbook-xml" \
+    /etc/xml/catalog
+xmlcatalog --noout --add "delegateSystem" \
+    "http://www.oasis-open.org/docbook/" \
+    "file:///etc/xml/docbook-xml" \
+    /etc/xml/catalog
+xmlcatalog --noout --add "delegateURI" \
+    "http://www.oasis-open.org/docbook/" \
+    "file:///etc/xml/docbook-xml" \
+    /etc/xml/catalog
diff --git a/app/text/docbook-xml/ympbuild b/app/text/docbook-xml/ympbuild
index f275e3e0..88c2f99c 100644
--- a/app/text/docbook-xml/ympbuild
+++ b/app/text/docbook-xml/ympbuild
@@ -7,47 +7,100 @@ description='Package description missing'
 email='akarsu@protonmail.com'
 maintainer='akarsu'
 license=('MIT')
-source=("https://docbook.org/xml/$version/docbook-xml-$version.zip" "LICENSE")
+source=('https://docbook.org/xml/4.1.2/docbkx412.zip'
+        "docbook-xml.sysconf")
 depends=(libxml2)
 makedepends=()
-md5sums=('03083e288e87a7e829e437358da7ef9e' 'SKIP')
+md5sums=('900d7609fb7e6d78901b357e4acfbc17'
+         'SKIP')
 group=(app.text)
 uses=()
 arch=('x86_64')
 
 #cd $name-$version
 
+_vers=(4.{2..5})
 
-build(){
-    #make $jobs
-    local ver xml
-}
-
+for _ver in ${_vers[@]}; do
+  source+=("https://docbook.org/xml/$_ver/docbook-xml-$_ver.zip")
+  md5sums+=('SKIP')
+done
 package(){
-    #make install $jobs
-    
+  local ver xml
 
-	mkdir -p "$DESTDIR/etc/xml"
-	xmlcatalog --noout --create "$DESTDIR/etc/xml/docbook-xml"
+  mkdir -p "$DESTDIR/etc/xml"
+  xmlcatalog --noout --create "$DESTDIR/etc/xml/docbook-xml"
 
-	mkdir docbook-xml-$version
-	bsdtar -C docbook-xml-$version -xf docbook-xml-$version.zip
+  mkdir docbook-xml-4.1.2
+  bsdtar -C docbook-xml-4.1.2 -xf docbkx412.zip
+  for ver in ${_vers[@]}; do
+    mkdir docbook-xml-$ver
+    bsdtar -C docbook-xml-$ver -xf docbook-xml-$ver.zip
+  done
 
-	pushd docbook-xml-$version
-	mkdir -p "$DESTDIR/usr/share/xml/docbook/xml-dtd-$version"
-	cp -dr docbook.cat *.dtd ent/ *.mod \
-		"$DESTDIR/usr/share/xml/docbook/xml-dtd-$version"
-	popd
-	
-	xmlcatalog --noout --add "public" \
-	  "-//OASIS//DTD DocBook XML V$verdion//EN" \
-	  "http://www.oasis-open.org/docbook/xml/$version/docbookx.dtd" \
-	  "$DESTDIR/etc/xml/docbook-xml"
+  for ver in 4.1.2 ${_vers[@]}; do
+    pushd docbook-xml-$ver
+    mkdir -p "$DESTDIR/usr/share/xml/docbook/xml-dtd-$ver"
+    cp -dr docbook.cat *.dtd ent/ *.mod \
+        "$DESTDIR/usr/share/xml/docbook/xml-dtd-$ver"
+    popd
 
-	install -Dt "$DESTDIR/usr/share/licenses/$name" -m644 LICENSE
-
-	# Fix permissions
-	find "$DESTDIR" -type f -exec chmod -c a-x {} +
-	chmod -Rc u=rwX,go=rX "$DESTDIR"
+    xml=
+    case $ver in
+      4.1.2) xml=' XML' ;;&
+      *)
+        xmlcatalog --noout --add "public" \
+          "-//OASIS//DTD DocBook XML V$ver//EN" \
+          "http://www.oasis-open.org/docbook/xml/$ver/docbookx.dtd" \
+          "$DESTDIR/etc/xml/docbook-xml"
+        xmlcatalog --noout --add "public" \
+          "-//OASIS//DTD DocBook$xml CALS Table Model V$ver//EN" \
+          "http://www.oasis-open.org/docbook/xml/$ver/calstblx.dtd" \
+          "$DESTDIR/etc/xml/docbook-xml"
+        xmlcatalog --noout --add "public" \
+          "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+          "http://www.oasis-open.org/docbook/xml/$ver/soextblx.dtd" \
+          "$DESTDIR/etc/xml/docbook-xml"
+        xmlcatalog --noout --add "public" \
+          "-//OASIS//ELEMENTS DocBook$xml Information Pool V$ver//EN" \
+          "http://www.oasis-open.org/docbook/xml/$ver/dbpoolx.mod" \
+          "$DESTDIR/etc/xml/docbook-xml"
+        xmlcatalog --noout --add "public" \
+          "-//OASIS//ELEMENTS DocBook$xml Document Hierarchy V$ver//EN" \
+          "http://www.oasis-open.org/docbook/xml/$ver/dbhierx.mod" \
+          "$DESTDIR/etc/xml/docbook-xml"
+        xmlcatalog --noout --add "public" \
+          "-//OASIS//ENTITIES DocBook$xml Additional General Entities V$ver//EN" \
+          "http://www.oasis-open.org/docbook/xml/$ver/dbgenent.mod" \
+          "$DESTDIR/etc/xml/docbook-xml"
+        xmlcatalog --noout --add "public" \
+          "-//OASIS//ENTITIES DocBook$xml Notations V$ver//EN" \
+          "http://www.oasis-open.org/docbook/xml/$ver/dbnotnx.mod" \
+          "$DESTDIR/etc/xml/docbook-xml"
+        xmlcatalog --noout --add "public" \
+          "-//OASIS//ENTITIES DocBook$xml Character Entities V$ver//EN" \
+          "http://www.oasis-open.org/docbook/xml/$ver/dbcentx.mod" \
+          "$DESTDIR/etc/xml/docbook-xml"
+        ;;&
+      4.[45])
+        xmlcatalog --noout --add "public" \
+          "-//OASIS//ELEMENTS DocBook XML HTML Tables V$ver//EN" \
+          "http://www.oasis-open.org/docbook/xml/$ver/htmltblx.mod" \
+          "$DESTDIR/etc/xml/docbook-xml"
+        ;;&
+      *)
+        xmlcatalog --noout --add "rewriteSystem" \
+          "http://www.oasis-open.org/docbook/xml/$ver" \
+          "/usr/share/xml/docbook/xml-dtd-$ver" \
+          "$DESTDIR/etc/xml/docbook-xml"
+        xmlcatalog --noout --add "rewriteURI" \
+          "http://www.oasis-open.org/docbook/xml/$ver" \
+          "/usr/share/xml/docbook/xml-dtd-$ver" \
+          "$DESTDIR/etc/xml/docbook-xml"
+        ;;&
+    esac
+  done
+  mkdir -p "$DESTDIR/etc/sysconf.d"
+  install docbook-xml.sysconf "$DESTDIR/etc/sysconf.d/docbook-xml"
 }
 
diff --git a/app/text/docbook-xsl/docbook-xsl.sysconf b/app/text/docbook-xsl/docbook-xsl.sysconf
index e03bb552..23d9c69e 100644
--- a/app/text/docbook-xsl/docbook-xsl.sysconf
+++ b/app/text/docbook-xsl/docbook-xsl.sysconf
@@ -1,39 +1,26 @@
 #!/bin/sh
 
-if [ ! -f /etc/xml/catalog ]; then
-    mkdir -p /etc/xml/
-    mkdir -p /usr/share/xml/docbook
-	xmlcatalog --noout --create /etc/xml/catalog
-fi
-
 metadata="/var/lib/ymp/metadata/docbook-xsl.yaml"
 ver=$(grep version $metadata | cut -f2 -d":" | tr -d " ")
 
-docbookdir=/usr/share/xml/docbook
-urls="
-	http://cdn.docbook.org/release/xsl-nons
-	http://docbook.sourceforge.net/release/xsl
-"
-
-
-update_catalog(){
-
-	for url in $urls; do
-		for rewrite in rewriteSystem rewriteURI; do
-			for version in $ver current; do
-				xmlcatalog --noout --add "$rewrite" \
-					"$url/$version" \
-					"file://$docbookdir/xsl-stylesheets-$version" \
-					/etc/xml/catalog
-			done
-		done
-	done
+_xmlcatalog() {
+  xmlcatalog --noout "$@" /etc/xml/catalog
 }
 
-current=$(date +%s -r $metadata)
-last=$(cat /var/lib/ymp/sysconf/docbook-xsl/update.date)
-if [ "$current" != "$last" ] ; then
-    update_catalog
-    date +%s -r $metadata > /var/lib/ymp/sysconf/docbook-xsl/update.date
-fi
+[[ -f etc/xml/catalog ]] || _xmlcatalog --create
+for ver in $new current; do
+    for x in rewriteSystem rewriteURI; do
+        _xmlcatalog --add $x http://cdn.docbook.org/release/xsl/$ver \
+            /usr/share/xml/docbook/xsl-stylesheets-$ver
+
+        _xmlcatalog --add $x http://cdn.docbook.org/release/xsl-nons/$ver \
+            /usr/share/xml/docbook/xsl-stylesheets-$ver-nons
+
+        _xmlcatalog --add $x http://docbook.sourceforge.net/release/xsl-ns/$ver \
+            /usr/share/xml/docbook/xsl-stylesheets-$ver
+
+        _xmlcatalog --add $x http://docbook.sourceforge.net/release/xsl/$ver \
+            /usr/share/xml/docbook/xsl-stylesheets-$ver-nons
+    done
+done
 
diff --git a/app/text/docbook-xsl/ympbuild b/app/text/docbook-xsl/ympbuild
index 9ddf49dd..2fe27e92 100644
--- a/app/text/docbook-xsl/ympbuild
+++ b/app/text/docbook-xsl/ympbuild
@@ -7,48 +7,50 @@ description='XML stylesheets for Docbook-xml transformations'
 email='akarsu@protonmail.com'
 maintainer='akarsu'
 license=('custom')
-source=(https://github.com/docbook/xslt10-stylesheets/releases/download/release/${version}/docbook-xsl{,-nons}-${version}.zip
-    'docbook-xls.install'
-    '765567_non-recursive_string_subst.patch')
+source=(https://github.com/docbook/xslt10-stylesheets/releases/download/release/$version/docbook-xsl-$version.zip
+        '765567_non-recursive_string_subst.patch'
+        'docbook-xsl.sysconf')
 depends=(docbook-xml libxml2 libxslt)
 makedepends=()
-md5sums=('39c12481817d5a57501d27621eeba9a8' 'df397633036d576f04431f1b00047910' 'SKIP' 'SKIP')
+md5sums=('39c12481817d5a57501d27621eeba9a8'
+         'SKIP'
+         'SKIP')
 group=(app.text)
 uses=()
 arch=('x86_64')
 
-install=../../$name.install
 cd $name-$version
 
-ls -l ../
-build(){
-	patch -Np2 -i ../765567_non-recursive_string_subst.patch
-	cd ../$name-nons-$version
+prepare(){
 	patch -Np2 -i ../765567_non-recursive_string_subst.patch
 }
 
 package(){
+	local _dest dir f
+	_dest="$DESTDIR"/usr/share/xml/docbook/xsl-stylesheets-$version
 
-	local pkgroot ns dir
-	for ns in -nons ''; do
-	pkgroot="$DESTDIR/usr/share/xml/docbook/xsl-stylesheets-$version$ns"
-	dir="../"$name$ns-$version
+	install -dm755 "$_dest"
+	install -m644 VERSION VERSION.xsl "$_dest"/
+	ln -s xsl-stylesheets-$version "${_dest%/*}/xsl-stylesheets"
+	ln -s xsl-stylesheets-$version "${_dest%/*}/xsl-stylesheets-current"
 
-	install -Dt "$pkgroot" -m644 $dir/VERSION{,.xsl}
+	for dir in assembly common eclipse epub epub3 fo highlighting html \
+		htmlhelp javahelp lib manpages params profiling roundtrip \
+		template website xhtml xhtml-1_1 xhtml5; do
 
-	(
-	  shopt -s nullglob  # ignore missing files
-	  for fn in assembly common eclipse epub epub3 fo highlighting html \
-		htmlhelp javahelp lib manpages params profiling roundtrip template \
-		website xhtml xhtml-1_1 xhtml5
-	  do
-		install -Dt "$pkgroot/$fn" -m644 $dir/$fn/*.{xml,xsl,dtd,ent}
-	  done
-	)
+		install -dm755 $_dest/$dir
+		for f in $dir/*.xml $dir/*.xsl $dir/*.dtd $dir/*.ent; do
+			[ -e "$f" ] || continue
+			install -m644 $f $_dest/$dir
+		done
 	done
-    install -v -m644 -D README /usr/share/doc/docbook-xsl-nons-1.79.2/README.txt
-    install -v -m644    RELEASE-NOTES* NEWS* /usr/share/doc/docbook-xsl-nons-1.79.2
-	install -d "$DESTDIR/etc/xml"
-	install -Dt "$DESTDIR/usr/share/licenses/$name" -m644 $dir/COPYING
+
+	install -dm755 "$DESTDIR"/etc/xml
+
+	install -m644 -D COPYING \
+		"$DESTDIR"/usr/share/licenses/$name/COPYING
+
+        install -dm755 "$DESTDIR"/etc/sysconf.d/
+        install $HOME/docbook-xsl.sysconf "$DESTDIR"/etc/sysconf.d/docbook-xsl
 }
 
diff --git a/x11/misc/xdg-utils/ympbuild b/x11/misc/xdg-utils/ympbuild
deleted file mode 100644
index f130d753..00000000
--- a/x11/misc/xdg-utils/ympbuild
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-name='xdg-utils'
-release='1'
-version='1.1.3'
-url='https://www.freedesktop.org/wiki/Software/xdg-utils/'
-description='Command line tools that assist applications with a variety of desktop integration tasks'
-email='akarsu@protonmail.com'
-maintainer='akarsu'
-license=('GPLv3')
-source=("https://portland.freedesktop.org/download/xdg-utils-$version.tar.gz"
-"https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/21.patch")
-depends=(file xorg-xset xorg-xprop)
-makedepends=(docbook-xsl lynx xmlto git)
-md5sums=('902042508b626027a3709d105f0b63ff' '31376a25c58f023d1bcbbb79afa9c3da')
-group=(x11.misc)
-uses=()
-arch=('x86_64')
-
-cd $name-$version
-
-patch -Np1 -i ../21.patch
-
-setup(){
-    ./configure --prefix=/usr \
-        --libdir=/usr/lib64/ \
-        #--docdir=
-}
-
-build(){
-    make $jobs
-}
-
-package(){
-    make DESTDIR="$DESTDIR" install
-    install -D -m644 LICENSE "$DESTDIR/usr/share/licenses/$name/LICENSE"
-
-    # install empty directory to prevent xdg-desktop-menu install *.desktop to fail, see FS#33316
-    install -dm755 "$DESTDIR"/usr/share/desktop-directories
-}
-