diff --git a/autogen/PKGBUILD b/autogen/PKGBUILD
index 660b1862..f6e49b53 100644
--- a/autogen/PKGBUILD
+++ b/autogen/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=autogen
 pkgver=5.18.16
-pkgrel=3
+pkgrel=4
 pkgdesc="A tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text"
 arch=('i686' 'x86_64')
 url="https://autogen.sourceforge.io/"
@@ -10,14 +10,17 @@ license=('GPL3')
 makedepends=('gcc' 'gmp-devel' 'libcrypt-devel' 'libffi-devel' 'libgc-devel' 'libguile-devel' 'libxml2-devel' 'make' 'autoconf' 'automake-wrapper' 'libtool')
 depends=('gcc-libs' 'gmp' 'libcrypt' 'libffi' 'libgc' 'libguile' 'libxml2')
 source=("https://ftp.gnu.org/gnu/${pkgname}/rel${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.sig}
+        autogen-guile-3.0.patch
         autogen-5.18.1-msys2.patch)
 sha256sums=('f8a13466b48faa3ba99fe17a069e71c9ab006d9b1cfabe699f8c60a47d5bb49a'
             'SKIP'
+            'f57152bb9b192ddd2ae31741b2b0bf43f8bea58211fcbf15fb3b7f4084e5aaa3'
             'ff3df8d191a6269a2f64b6ec19d24bb5d169d316104f97f14a094633aaa77386')
 validpgpkeys=('3EEE51D1355B8EC40D9F3122495143D05D0712D1')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i ${srcdir}/autogen-guile-3.0.patch
   patch -p1 -i ${srcdir}/autogen-5.18.1-msys2.patch
   autoreconf -fiv
 }
diff --git a/autogen/autogen-5.18.12-allow-guile-2.2.patch b/autogen/autogen-5.18.12-allow-guile-2.2.patch
deleted file mode 100644
index a63c3da2..00000000
--- a/autogen/autogen-5.18.12-allow-guile-2.2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/agen5/guile-iface.h b/agen5/guile-iface.h
-index 0aeabb0..6ce3520 100644
---- a/agen5/guile-iface.h
-+++ b/agen5/guile-iface.h
-@@ -9,7 +9,7 @@
- # error AutoGen does not work with this version of Guile
-   choke me.
- 
--#elif GUILE_VERSION < 201000
-+#else
- # define AG_SCM_IS_PROC(_p)           scm_is_true( scm_procedure_p(_p))
- # define AG_SCM_LIST_P(_l)            scm_is_true( scm_list_p(_l))
- # define AG_SCM_PAIR_P(_p)            scm_is_true( scm_pair_p(_p))
-@@ -24,9 +24,6 @@
- # define AG_SCM_TO_ULONG(_v)          ((unsigned long)scm_to_ulong(_v))
- # define AG_SCM_VEC_P(_v)             scm_is_vector(_v)
- 
--#else
--# error unknown GUILE_VERSION
--  choke me.
- #endif
- 
- #endif /* MUTATING_GUILE_IFACE_H_GUARD */
-diff --git a/configure b/configure
-index befe20b..c4254eb 100755
---- a/configure
-+++ b/configure
-@@ -14191,7 +14191,7 @@ $as_echo "no" >&6; }
- 		PKG_CONFIG=""
- 	fi
- fi
--  _guile_versions_to_search="2.0 1.8"
-+  _guile_versions_to_search="2.2 2.0 1.8"
-   if test -n "$GUILE_EFFECTIVE_VERSION"; then
-     _guile_tmp=""
-     for v in $_guile_versions_to_search; do
diff --git a/autogen/autogen-5.18.12-fix-guile-iface.patch b/autogen/autogen-5.18.12-fix-guile-iface.patch
deleted file mode 100644
index 0839d276..00000000
--- a/autogen/autogen-5.18.12-fix-guile-iface.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/agen5/guile-iface.h b/agen5/guile-iface.h
-index 0aeabb0..6ce3520 100644
---- a/agen5/guile-iface.h
-+++ b/agen5/guile-iface.h
-@@ -9,7 +9,7 @@
- # error AutoGen does not work with this version of Guile
-   choke me.
- 
--#elif GUILE_VERSION < 201000
-+#else
- # define AG_SCM_IS_PROC(_p)           scm_is_true( scm_procedure_p(_p))
- # define AG_SCM_LIST_P(_l)            scm_is_true( scm_list_p(_l))
- # define AG_SCM_PAIR_P(_p)            scm_is_true( scm_pair_p(_p))
-@@ -24,9 +24,6 @@
- # define AG_SCM_TO_ULONG(_v)          ((unsigned long)scm_to_ulong(_v))
- # define AG_SCM_VEC_P(_v)             scm_is_vector(_v)
- 
--#else
--# error unknown GUILE_VERSION
--  choke me.
- #endif
- 
- #endif /* MUTATING_GUILE_IFACE_H_GUARD */
diff --git a/autogen/autogen-5.18.12-fix-guile-version-check.patch b/autogen/autogen-5.18.12-fix-guile-version-check.patch
deleted file mode 100644
index d1ed3fc8..00000000
--- a/autogen/autogen-5.18.12-fix-guile-version-check.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- autogen-5.18.12/config/guile-orig.m4	2017-11-21 15:23:45.047606700 -0500
-+++ autogen-5.18.12/config/guile.m4	2017-11-21 15:24:20.414686700 -0500
-@@ -47,7 +47,7 @@
- # for an available version of Guile.
- #
- # By default, this macro will search for the latest stable version of
--# Guile (e.g. 2.0), falling back to the previous stable version
-+# Guile (e.g. 2.2), falling back to the previous stable version
- # (e.g. 1.8) if it is available.  If no guile-@var{VERSION}.pc file is
- # found, an error is signalled.  The found version is stored in
- # @var{GUILE_EFFECTIVE_VERSION}.
-@@ -61,7 +61,7 @@
- #
- AC_DEFUN([GUILE_PKG],
-  [PKG_PROG_PKG_CONFIG
--  _guile_versions_to_search="m4_default([$1], [2.0 1.8])"
-+  _guile_versions_to_search="m4_default([$1], [2.2 1.8])"
-   if test -n "$GUILE_EFFECTIVE_VERSION"; then
-     _guile_tmp=""
-     for v in $_guile_versions_to_search; do
-@@ -184,7 +184,7 @@
- # If @code{guile} is not found, signal an error.
- #
- # By default, this macro will search for the latest stable version of
--# Guile (e.g. 2.0). x.y or x.y.z versions can be specified. If an older
-+# Guile (e.g. 2.2). x.y or x.y.z versions can be specified. If an older
- # version is found, the macro will signal an error.
- #
- # The effective version of the found @code{guile} is set to
-@@ -201,7 +201,7 @@
-  [AC_PATH_PROG(GUILE,guile)
-   _guile_required_version="m4_default([$1], [$GUILE_EFFECTIVE_VERSION])"
-   if test -z "$_guile_required_version"; then
--    _guile_required_version=2.0
-+    _guile_required_version=2.2
-   fi
-   if test "$GUILE" = "" ; then
-       AC_MSG_ERROR([guile required but not found])
diff --git a/autogen/autogen-guile-3.0.patch b/autogen/autogen-guile-3.0.patch
new file mode 100644
index 00000000..235285a2
--- /dev/null
+++ b/autogen/autogen-guile-3.0.patch
@@ -0,0 +1,48 @@
+Index: autogen-5.18.16/agen5/guile-iface.h
+===================================================================
+--- autogen-5.18.16.orig/agen5/guile-iface.h
++++ autogen-5.18.16/agen5/guile-iface.h
+@@ -9,16 +9,13 @@
+ # error AutoGen does not work with this version of Guile
+   choke me.
+ 
+-#elif GUILE_VERSION < 203000
++#else
+ # define AG_SCM_IS_PROC(_p)           scm_is_true( scm_procedure_p(_p))
+ # define AG_SCM_LIST_P(_l)            scm_is_true( scm_list_p(_l))
+ # define AG_SCM_PAIR_P(_p)            scm_is_true( scm_pair_p(_p))
+ # define AG_SCM_TO_LONG(_v)           scm_to_long(_v)
+ # define AG_SCM_TO_ULONG(_v)          ((unsigned long)scm_to_ulong(_v))
+ 
+-#else
+-# error unknown GUILE_VERSION
+-  choke me.
+ #endif
+ 
+ #endif /* MUTATING_GUILE_IFACE_H_GUARD */
+Index: autogen-5.18.16/configure
+===================================================================
+--- autogen-5.18.16.orig/configure
++++ autogen-5.18.16/configure
+@@ -14798,7 +14798,7 @@ $as_echo "no" >&6; }
+ 		PKG_CONFIG=""
+ 	fi
+ fi
+-  _guile_versions_to_search="2.2 2.0 1.8"
++  _guile_versions_to_search="3.0 2.2 2.0 1.8"
+   if test -n "$GUILE_EFFECTIVE_VERSION"; then
+     _guile_tmp=""
+     for v in $_guile_versions_to_search; do
+Index: autogen-5.18.16/config/guile.m4
+===================================================================
+--- autogen-5.18.16.orig/config/guile.m4
++++ autogen-5.18.16/config/guile.m4
+@@ -61,7 +61,7 @@
+ #
+ AC_DEFUN([GUILE_PKG],
+  [PKG_PROG_PKG_CONFIG
+-  _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])"
++  _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0 1.8])"
+   if test -n "$GUILE_EFFECTIVE_VERSION"; then
+     _guile_tmp=""
+     for v in $_guile_versions_to_search; do