diff --git a/autoconf2.69/PKGBUILD b/autoconf2.69/PKGBUILD
index d2210b61..f272349a 100644
--- a/autoconf2.69/PKGBUILD
+++ b/autoconf2.69/PKGBUILD
@@ -4,13 +4,13 @@
 _realname=autoconf
 pkgname=${_realname}2.69
 pkgver=2.69
-pkgrel=3
+pkgrel=4
 pkgdesc="A GNU tool for automatically configuring source code"
 arch=('any')
-license=('GPL2' 'GPL3' 'custom')
+license=('spdx:GPL-2.0-or-later' 'spdx:GPL-3.0-or-later' 'spdx:Autoconf-exception-3.0')
 url="https://www.gnu.org/software/autoconf"
 depends=('awk' 'm4' 'diffutils' 'bash' 'perl')
-makedepends=('gcc-fortran' 'make')
+makedepends=('make')
 source=(https://ftp.gnu.org/pub/gnu/${_realname}/${_realname}-${pkgver}.tar.xz
         0001-fix-texinfo.patch
         0002-msys2.patch
@@ -53,9 +53,9 @@ prepare() {
 }
 
 build() {
-  cd ${srcdir}/${_realname}-${pkgver}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
-  ./configure \
+  ../${_realname}-${pkgver}/configure \
     --prefix=/usr \
     --program-suffix=-2.69
 
@@ -63,16 +63,16 @@ build() {
 }
 
 check() {
-  cd ${srcdir}/${_realname}-${pkgver}
+  cd ${srcdir}/build-${MSYSTEM}
   make check
 }
 
 package() {
-  cd ${srcdir}/${_realname}-${pkgver}
+  cd ${srcdir}/build-${MSYSTEM}
   make DESTDIR=${pkgdir} install
 
   # license exception
-  install -Dm644 COPYING.EXCEPTION \
+  install -Dm644 ${srcdir}/${_realname}-${pkgver}/COPYING.EXCEPTION \
     $pkgdir/usr/share/licenses/autoconf${pkgver}/COPYING.EXCEPTION
 
   # conflicts with autoconf
diff --git a/autoconf2.71/PKGBUILD b/autoconf2.71/PKGBUILD
index 1e676cd1..ffa8268f 100644
--- a/autoconf2.71/PKGBUILD
+++ b/autoconf2.71/PKGBUILD
@@ -4,14 +4,13 @@
 _realname=autoconf
 pkgname=${_realname}2.71
 pkgver=2.71
-pkgrel=2
+pkgrel=3
 pkgdesc="A GNU tool for automatically configuring source code"
 arch=('any')
-license=('GPL2' 'GPL3' 'custom')
+license=('spdx:GPL-2.0-or-later' 'spdx:GPL-3.0-or-later' 'spdx:Autoconf-exception-3.0')
 url="https://www.gnu.org/software/autoconf"
 depends=('awk' 'm4' 'diffutils' 'bash' 'perl' 'sed')
 makedepends=('make')
-checkdepends=('gcc-fortran')
 source=(https://ftp.gnu.org/pub/gnu/${_realname}/${_realname}-${pkgver}.tar.xz
         0001-autoconf-2.70-MSYS2-specifics-AC_CYGWIN.patch
         0002-autoconf-2.70-MSYS2-Autotest-Unify-EOLs-By-Default.patch
@@ -51,8 +50,7 @@ prepare() {
 }
 
 build() {
-  mkdir -p build-${_realname}-${pkgver}
-  cd build-${_realname}-${pkgver}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   ../${_realname}-${pkgver}/configure \
     --prefix=/usr \
@@ -62,13 +60,13 @@ build() {
 }
 
 check() {
-  cd build-${_realname}-${pkgver}
+  cd build-${MSYSTEM}
   # CAUTION: The tests run very very long, even on a server.
   make check TESTSUITEFLAGS='-j16'
 }
 
 package() {
-  make -C build-${_realname}-${pkgver} DESTDIR=${pkgdir} install
+  make -C build-${MSYSTEM} DESTDIR=${pkgdir} install
 
   # license exception
   install -Dm644 ${_realname}-${pkgver}/COPYING.EXCEPTION \