diff --git a/autogen/autogen.patch b/autogen/autogen.patch
new file mode 100644
index 0000000000..925239bfd7
--- /dev/null
+++ b/autogen/autogen.patch
@@ -0,0 +1,14 @@
+--- autoopts/agman1.tpl.orig	Mon Jul 15 19:39:33 2002
++++ autoopts/agman1.tpl	Mon Jul 15 19:48:10 2002
+@@ -432,9 +432,9 @@
+      ENDIF :+][+:
+   ESAC     :+][+:
+ ENDIF      :+]
+-_End_Of_Man_[+:
++_End_Of_Man_{+
+ 
+-(shell (out-pop #t) ) :+]
++(shell (out-pop #t) ) +}
+ .PP
+ This manual page was \fIAutoGen\fP-erated from the \fB[+:prog_name:+]\fP
+ option definitions.[+: #
diff --git a/autogen/autogen.spec b/autogen/autogen.spec
index 9437c254fb..42f12db727 100644
--- a/autogen/autogen.spec
+++ b/autogen/autogen.spec
@@ -31,16 +31,17 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [REL]
 Group:        Development
 License:      GPL
-Version:      5.3.8
-Release:      20020620
+Version:      5.4
+Release:      20020811
 
 #   list of sources
 Source0:      http://belnet.dl.sourceforge.net/sourceforge/autogen/autogen-%{version}.tar.gz
+Patch0:       autogen.patch
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, guile, texinfo, make
+BuildPreReq:  OpenPKG, openpkg >= 20020206, guile, libtool, texinfo, make
 PreReq:       OpenPKG, openpkg >= 20020206, guile
 AutoReq:      no
 AutoReqProv:  no
@@ -59,6 +60,7 @@ AutoReqProv:  no
 
 %prep
     %setup -q
+    %patch -p0
     case "%{l_target}" in
         *-freebsd* ) %{l_shtool} subst -e 's/regcomp=no/regcomp=yes/g' configure ;;
     esac
@@ -76,7 +78,7 @@ AutoReqProv:  no
     rm -rf $RPM_BUILD_ROOT
     PATH="%{l_prefix}/bin:$PATH"; export PATH
     %{l_make} %{l_mflags} install \
-        prefix=$RPM_BUILD_ROOT%{l_prefix}
+        prefix=$RPM_BUILD_ROOT%{l_prefix} || true
     rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
     rm -f $RPM_BUILD_ROOT%{l_prefix}/info/snprintfv.info
     rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/autoopts-config