diff --git a/mingw-w64-m68k-apple-macos-binutils-git/.gitignore b/mingw-w64-m68k-apple-macos-binutils-git/.gitignore
new file mode 100644
index 0000000000..a4d9d13e58
--- /dev/null
+++ b/mingw-w64-m68k-apple-macos-binutils-git/.gitignore
@@ -0,0 +1 @@
+retro68/
diff --git a/mingw-w64-m68k-apple-macos-binutils-git/PKGBUILD b/mingw-w64-m68k-apple-macos-binutils-git/PKGBUILD
index 8fa2a27ae2..deaa8f124e 100644
--- a/mingw-w64-m68k-apple-macos-binutils-git/PKGBUILD
+++ b/mingw-w64-m68k-apple-macos-binutils-git/PKGBUILD
@@ -13,12 +13,17 @@ license=('GPL3')
 depends=("${MINGW_PACKAGE_PREFIX}-isl")
 makedepends=("${MINGW_PACKAGE_PREFIX}-libtool" autoconf automake git make bison flex)
 _commit=8d32c583aee7051b9cd3a99d88d5defa39e868cf
-source=("https://github.com/autc04/Retro68/archive/${_commit}.tar.gz")
-sha256sums=('827123e3ecd37a132a41b6bf510c9eed1d41c016a0a987beb39096dc7a0ed185')
+source=("retro68::git+https://github.com/autc04/Retro68#commit=${_commit}")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $srcdir/retro68
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
 
 build() {
   mkdir -p "${srcdir}/build-${CHOST}" && cd "${srcdir}/build-${CHOST}"
-  ../Retro68-${_commit}/binutils/configure \
+  ../retro68/binutils/configure \
 	--build=${MINGW_CHOST} \
 	--prefix=${MINGW_PREFIX} \
 	--target=m68k-apple-macos \
@@ -30,6 +35,6 @@ package() {
   cd "${srcdir}/build-${CHOST}"
   make DESTDIR="$pkgdir" install
   rm -rf "${pkgdir}${MINGW_PREFIX}/share/info"
-  cd ../Retro68-${_commit}
+  cd ../retro68
   install -D -m644 COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
 }
diff --git a/mingw-w64-powerpc-apple-macos-binutils-git/.gitignore b/mingw-w64-powerpc-apple-macos-binutils-git/.gitignore
new file mode 100644
index 0000000000..a4d9d13e58
--- /dev/null
+++ b/mingw-w64-powerpc-apple-macos-binutils-git/.gitignore
@@ -0,0 +1 @@
+retro68/
diff --git a/mingw-w64-powerpc-apple-macos-binutils/PKGBUILD b/mingw-w64-powerpc-apple-macos-binutils-git/PKGBUILD
similarity index 79%
rename from mingw-w64-powerpc-apple-macos-binutils/PKGBUILD
rename to mingw-w64-powerpc-apple-macos-binutils-git/PKGBUILD
index a849c51c67..2f52f67f15 100644
--- a/mingw-w64-powerpc-apple-macos-binutils/PKGBUILD
+++ b/mingw-w64-powerpc-apple-macos-binutils-git/PKGBUILD
@@ -13,12 +13,17 @@ license=('GPL3')
 depends=("${MINGW_PACKAGE_PREFIX}-isl")
 makedepends=("${MINGW_PACKAGE_PREFIX}-libtool" autoconf automake git make bison flex)
 _commit=8d32c583aee7051b9cd3a99d88d5defa39e868cf
-source=("https://github.com/autc04/Retro68/archive/${_commit}.tar.gz")
-sha256sums=('827123e3ecd37a132a41b6bf510c9eed1d41c016a0a987beb39096dc7a0ed185')
+source=("retro68::git+https://github.com/autc04/Retro68#commit=${_commit}")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $srcdir/retro68
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
 
 build() {
   mkdir -p "${srcdir}/build-${CHOST}" && cd "${srcdir}/build-${CHOST}"
-  ../Retro68-${_commit}/binutils/configure \
+  ../retro68/binutils/configure \
 	--build=${MINGW_CHOST} \
 	--prefix=${MINGW_PREFIX} \
 	--target=powerpc-apple-macos \
@@ -31,6 +36,6 @@ package() {
   cd "${srcdir}/build-${CHOST}"
   make DESTDIR="$pkgdir" install
   rm -rf "${pkgdir}${MINGW_PREFIX}/share/info"
-  cd ../Retro68-${_commit}
+  cd ../retro68
   install -D -m644 COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
 }