diff --git a/mingw-w64-graphviz/PKGBUILD b/mingw-w64-graphviz/PKGBUILD
index b496dee1d9..b1ed34f81a 100644
--- a/mingw-w64-graphviz/PKGBUILD
+++ b/mingw-w64-graphviz/PKGBUILD
@@ -4,7 +4,7 @@ _realname=graphviz
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.44.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Graph Visualization Software (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64')
@@ -41,7 +41,7 @@ makedepends=(#"${MINGW_PACKAGE_PREFIX}-ocaml" not tested yet need to build ocaml
              "${MINGW_PACKAGE_PREFIX}-zlib"
              "git")
 options=('strip')
-install=${_realname}-${CARCH}.install
+install=${_realname}-${MSYSTEM}.install
 source=(#${_realname}-${pkgver}::git+https://gitlab.com/graphviz/graphviz.git#tag=stable_release_${pkgver}
         https://www2.graphviz.org/Packages/stable/portable_source/graphviz-${pkgver}.tar.gz
         001-msvc-pragma.patch.patch
diff --git a/mingw-w64-graphviz/graphviz-x86_64.install b/mingw-w64-graphviz/graphviz-MINGW32.install
similarity index 50%
rename from mingw-w64-graphviz/graphviz-x86_64.install
rename to mingw-w64-graphviz/graphviz-MINGW32.install
index 2060a18eb3..4017c081c3 100644
--- a/mingw-w64-graphviz/graphviz-x86_64.install
+++ b/mingw-w64-graphviz/graphviz-MINGW32.install
@@ -1,5 +1,7 @@
+MINGW_INSTALL=mingw32
+
 post_install() {
-  mingw64/bin/dot -c
+  ${MINGW_INSTALL}/bin/dot -c
 }
 
 post_upgrade() {
diff --git a/mingw-w64-graphviz/graphviz-MINGW64.install b/mingw-w64-graphviz/graphviz-MINGW64.install
new file mode 100644
index 0000000000..67112bb04e
--- /dev/null
+++ b/mingw-w64-graphviz/graphviz-MINGW64.install
@@ -0,0 +1,9 @@
+MINGW_INSTALL=mingw64
+
+post_install() {
+  ${MINGW_INSTALL}/bin/dot -c
+}
+
+post_upgrade() {
+  post_install
+}
diff --git a/mingw-w64-graphviz/graphviz-i686.install b/mingw-w64-graphviz/graphviz-UCRT64.install
similarity index 50%
rename from mingw-w64-graphviz/graphviz-i686.install
rename to mingw-w64-graphviz/graphviz-UCRT64.install
index cc8d00513e..738214eb91 100644
--- a/mingw-w64-graphviz/graphviz-i686.install
+++ b/mingw-w64-graphviz/graphviz-UCRT64.install
@@ -1,5 +1,7 @@
+MINGW_INSTALL=ucrt64
+
 post_install() {
-  mingw32/bin/dot -c
+  ${MINGW_INSTALL}/bin/dot -c
 }
 
 post_upgrade() {