diff --git a/.gitignore b/.gitignore
index 41425a5..ed6ea26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/autogen-5.18.3.tar.xz
+/autogen-5.18.4.tar.xz
diff --git a/autogen-mktplconfig.patch b/autogen-mktplconfig.patch
deleted file mode 100644
index fe25798..0000000
--- a/autogen-mktplconfig.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up autogen-5.18.3/autoopts/mk-tpl-config.sh.mktplconfig autogen-5.18.3/autoopts/mk-tpl-config.sh
---- autogen-5.18.3/autoopts/mk-tpl-config.sh.mktplconfig	2014-05-10 17:48:26.000000000 +0200
-+++ autogen-5.18.3/autoopts/mk-tpl-config.sh	2014-05-27 14:05:26.961175451 +0200
-@@ -200,9 +200,8 @@ fix_guile() {
-     cd ${builddir}
-     find_libguiledir "${LGCFLAGS}"
- 
--    list=`set +e ; exec 2>/dev/null
--        find ${libguiledir}/libguile* -type f | \
--            xargs grep -l -E '\<noreturn\>'`
-+    list=`find ${libguiledir}/libguile* -type f | \
-+            xargs grep -l -E '\<noreturn\>' 2> /dev/null || :`
- 
-     test -z "$list" && exit 0
- 
diff --git a/autogen.spec b/autogen.spec
index 89169b2..d84075b 100644
--- a/autogen.spec
+++ b/autogen.spec
@@ -1,6 +1,6 @@
 Summary:	Automated text file generator
 Name:		autogen
-Version:	5.18.3
+Version:	5.18.4
 Release:	3%{?dist}
 # Some files are licensed under GPLv2+.
 # We redistribute them under GPLv3+.
@@ -11,8 +11,6 @@ Source0:	ftp://ftp.gnu.org/gnu/autogen/rel%{version}/%{name}-%{version}.tar.xz
 
 # Fix multilib conflicts
 Patch0:		autogen-multilib.patch
-# Fix mk-tpl-config.sh to not fail when guile headers don't use noreturn
-Patch1:		autogen-mktplconfig.patch
 
 Requires:	%{name}-libopts%{?_isa} = %{version}-%{release}
 Requires(post):	/sbin/install-info
@@ -58,7 +56,6 @@ This package contains development files for libopts.
 %prep
 %setup -q
 %patch0 -p1 -b .multilib
-%patch1 -p1 -b .mktplconfig
 
 # Disable failing test
 sed -i 's|errors.test||' autoopts/test/Makefile.in
diff --git a/sources b/sources
index a88f16e..0b194a8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e7e8bb177019771b600f35b124655959  autogen-5.18.3.tar.xz
+5171f4a7414adb85b7b25e8438791758  autogen-5.18.4.tar.xz