diff --git a/mingw-w64-docbook-mathml/PKGBUILD b/mingw-w64-docbook-mathml/PKGBUILD
index 92ee004f9d..11bc439e72 100644
--- a/mingw-w64-docbook-mathml/PKGBUILD
+++ b/mingw-w64-docbook-mathml/PKGBUILD
@@ -5,17 +5,17 @@ _realname=docbook-mathml
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=1.1CR1
-pkgrel=2
+pkgrel=3
 pkgdesc="MathML XML scheme (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64')
 url="https://www.oasis-open.org/docbook/"
 license=('MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-libxml2")
-install=docbook-mathml-${CARCH}.install
+install=docbook-mathml-${MSYSTEM}.install
 source=("https://www.docbook.org/xml/mathml/${pkgver}/dbmathml.dtd" 'LICENSE')
 sha256sums=('70da7140035621330f1b5ab6926197c3c3af467f2207d55a41f6396d9ad96abd'
-            '276a366862b4c9f5d3b0f5796d49b09542bb2699f1282c0a15cdbda4cfe725dc')
+            '57645f7ba4189dfc34f16c08b6bbe041ff298b09cdf57c784bab577bf37ecb24')
 
 package() {
   mkdir -p "$pkgdir${MINGW_PREFIX}/etc/xml"
diff --git a/mingw-w64-docbook-mathml/docbook-mathml-CLANG32.install b/mingw-w64-docbook-mathml/docbook-mathml-CLANG32.install
new file mode 100644
index 0000000000..faaa0ead82
--- /dev/null
+++ b/mingw-w64-docbook-mathml/docbook-mathml-CLANG32.install
@@ -0,0 +1,34 @@
+MINGW_INSTALL=clang32
+MINGW_XML_CATALOG=${MINGW_INSTALL}/etc/xml
+
+post_install() {
+  if [ ! -e ${MINGW_XML_CATALOG}/catalog ]; then
+    ${MINGW_INSTALL}/bin/xmlcatalog --noout --create ${MINGW_XML_CATALOG}/catalog
+  fi
+
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegatePublic" \
+    "-//OASIS//DTD DocBook MathML Module" \
+    "./docbook-mathml" \
+    ${MINGW_XML_CATALOG}/catalog
+
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateSystem" \
+    "http://www.oasis-open.org/docbook/xml/mathml/" \
+    "./docbook-mathml" \
+    ${MINGW_XML_CATALOG}/catalog
+
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateURI" \
+    "http://www.oasis-open.org/docbook/xml/mathml/" \
+    "./docbook-mathml" \
+    ${MINGW_XML_CATALOG}/catalog
+}
+
+post_upgrade() {
+  post_remove $2
+  post_install $1
+}
+
+post_remove() {
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --del ./docbook-mathml ${MINGW_XML_CATALOG}/catalog
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --del "-//OASIS//DTD DocBook MathML Module V1.1CR1//EN" ${MINGW_XML_CATALOG}/catalog
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --del "http://www.oasis-open.org/docbook/xml/mathml/1.1CR1/dbmathml.dtd" ${MINGW_XML_CATALOG}/catalog
+}
diff --git a/mingw-w64-docbook-mathml/docbook-mathml-CLANG64.install b/mingw-w64-docbook-mathml/docbook-mathml-CLANG64.install
new file mode 100644
index 0000000000..7cce64974a
--- /dev/null
+++ b/mingw-w64-docbook-mathml/docbook-mathml-CLANG64.install
@@ -0,0 +1,34 @@
+MINGW_INSTALL=clang64
+MINGW_XML_CATALOG=${MINGW_INSTALL}/etc/xml
+
+post_install() {
+  if [ ! -e ${MINGW_XML_CATALOG}/catalog ]; then
+    ${MINGW_INSTALL}/bin/xmlcatalog --noout --create ${MINGW_XML_CATALOG}/catalog
+  fi
+
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegatePublic" \
+    "-//OASIS//DTD DocBook MathML Module" \
+    "./docbook-mathml" \
+    ${MINGW_XML_CATALOG}/catalog
+
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateSystem" \
+    "http://www.oasis-open.org/docbook/xml/mathml/" \
+    "./docbook-mathml" \
+    ${MINGW_XML_CATALOG}/catalog
+
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateURI" \
+    "http://www.oasis-open.org/docbook/xml/mathml/" \
+    "./docbook-mathml" \
+    ${MINGW_XML_CATALOG}/catalog
+}
+
+post_upgrade() {
+  post_remove $2
+  post_install $1
+}
+
+post_remove() {
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --del ./docbook-mathml ${MINGW_XML_CATALOG}/catalog
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --del "-//OASIS//DTD DocBook MathML Module V1.1CR1//EN" ${MINGW_XML_CATALOG}/catalog
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --del "http://www.oasis-open.org/docbook/xml/mathml/1.1CR1/dbmathml.dtd" ${MINGW_XML_CATALOG}/catalog
+}
diff --git a/mingw-w64-docbook-mathml/docbook-mathml-CLANGARM64.install b/mingw-w64-docbook-mathml/docbook-mathml-CLANGARM64.install
new file mode 100644
index 0000000000..825cd406b2
--- /dev/null
+++ b/mingw-w64-docbook-mathml/docbook-mathml-CLANGARM64.install
@@ -0,0 +1,34 @@
+MINGW_INSTALL=clangarm64
+MINGW_XML_CATALOG=${MINGW_INSTALL}/etc/xml
+
+post_install() {
+  if [ ! -e ${MINGW_XML_CATALOG}/catalog ]; then
+    ${MINGW_INSTALL}/bin/xmlcatalog --noout --create ${MINGW_XML_CATALOG}/catalog
+  fi
+
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegatePublic" \
+    "-//OASIS//DTD DocBook MathML Module" \
+    "./docbook-mathml" \
+    ${MINGW_XML_CATALOG}/catalog
+
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateSystem" \
+    "http://www.oasis-open.org/docbook/xml/mathml/" \
+    "./docbook-mathml" \
+    ${MINGW_XML_CATALOG}/catalog
+
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateURI" \
+    "http://www.oasis-open.org/docbook/xml/mathml/" \
+    "./docbook-mathml" \
+    ${MINGW_XML_CATALOG}/catalog
+}
+
+post_upgrade() {
+  post_remove $2
+  post_install $1
+}
+
+post_remove() {
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --del ./docbook-mathml ${MINGW_XML_CATALOG}/catalog
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --del "-//OASIS//DTD DocBook MathML Module V1.1CR1//EN" ${MINGW_XML_CATALOG}/catalog
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --del "http://www.oasis-open.org/docbook/xml/mathml/1.1CR1/dbmathml.dtd" ${MINGW_XML_CATALOG}/catalog
+}
diff --git a/mingw-w64-docbook-mathml/docbook-mathml-i686.install b/mingw-w64-docbook-mathml/docbook-mathml-MINGW32.install
similarity index 100%
rename from mingw-w64-docbook-mathml/docbook-mathml-i686.install
rename to mingw-w64-docbook-mathml/docbook-mathml-MINGW32.install
diff --git a/mingw-w64-docbook-mathml/docbook-mathml-x86_64.install b/mingw-w64-docbook-mathml/docbook-mathml-MINGW64.install
similarity index 100%
rename from mingw-w64-docbook-mathml/docbook-mathml-x86_64.install
rename to mingw-w64-docbook-mathml/docbook-mathml-MINGW64.install
diff --git a/mingw-w64-docbook-mathml/docbook-mathml-UCRT64.install b/mingw-w64-docbook-mathml/docbook-mathml-UCRT64.install
new file mode 100644
index 0000000000..4aac55c662
--- /dev/null
+++ b/mingw-w64-docbook-mathml/docbook-mathml-UCRT64.install
@@ -0,0 +1,34 @@
+MINGW_INSTALL=ucrt64
+MINGW_XML_CATALOG=${MINGW_INSTALL}/etc/xml
+
+post_install() {
+  if [ ! -e ${MINGW_XML_CATALOG}/catalog ]; then
+    ${MINGW_INSTALL}/bin/xmlcatalog --noout --create ${MINGW_XML_CATALOG}/catalog
+  fi
+
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegatePublic" \
+    "-//OASIS//DTD DocBook MathML Module" \
+    "./docbook-mathml" \
+    ${MINGW_XML_CATALOG}/catalog
+
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateSystem" \
+    "http://www.oasis-open.org/docbook/xml/mathml/" \
+    "./docbook-mathml" \
+    ${MINGW_XML_CATALOG}/catalog
+
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --add "delegateURI" \
+    "http://www.oasis-open.org/docbook/xml/mathml/" \
+    "./docbook-mathml" \
+    ${MINGW_XML_CATALOG}/catalog
+}
+
+post_upgrade() {
+  post_remove $2
+  post_install $1
+}
+
+post_remove() {
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --del ./docbook-mathml ${MINGW_XML_CATALOG}/catalog
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --del "-//OASIS//DTD DocBook MathML Module V1.1CR1//EN" ${MINGW_XML_CATALOG}/catalog
+  ${MINGW_INSTALL}/bin/xmlcatalog --noout --del "http://www.oasis-open.org/docbook/xml/mathml/1.1CR1/dbmathml.dtd" ${MINGW_XML_CATALOG}/catalog
+}