diff --git a/lynx.spec b/lynx.spec
index bf14230..70a372d 100644
--- a/lynx.spec
+++ b/lynx.spec
@@ -1,7 +1,7 @@
 Summary: A text-based Web browser.
 Name: lynx
 Version: 2.8.5
-Release: 3
+Release: 6
 License: GPL
 Group: Applications/Internet
 Source: http://lynx.isc.org/current/lynx2.8.5dev.7.tar.bz2
@@ -14,7 +14,6 @@ Patch0: lynx-2.8.4-redhat.patch
 Patch1: lynx2-8-2-telnet.patch
 Patch2: lynx-284-i18ncfg.patch
 Patch3: lynx-284-ipv6-salen.patch
-Patch4: lynx-2.8.5-ncurses.patch
 Requires: indexhtml
 Provides: webclient
 BuildRequires: openssl-devel, ncurses-devel, slang-devel, zlib-devel
@@ -32,13 +31,25 @@ exits quickly and swiftly displays webpages.
 %patch1 -p1 -b .telnet
 %patch2 -p1 -b .i18ncfg
 %patch3 -p1 -b .salen
-%patch4 -p1 -b .ncurses
 perl -pi -e "s,^HELPFILE:.*,HELPFILE:file://localhost/usr/share/doc/lynx-%{version}/lynx_help/lynx_help_main.html,g" lynx.cfg
 perl -pi -e "s,^DEFAULT_INDEX_FILE:.*,DEFAULT_INDEX_FILE:http://www.google.com/,g" lynx.cfg
 
 %build
+export PATH=`pwd`:$PATH
+cat >gcc <<EOF
+#!/bin/sh
+ARGS=""
+while [ \$# != 0 ]; do
+	if [ \$1 != "-I/usr/include" -a \$1 != "-I/usr/include/" ]; then
+		ARGS="\$ARGS \$1"
+	fi
+	shift
+done
+exec /usr/bin/gcc \$ARGS
+EOF
+chmod 0755 gcc
 export CFLAGS="-ggdb $RPM_OPT_FLAGS -DNCURSES -DNCURSES_MOUSE_VERSION" CXXFLAGS="-ggdb $RPM_OPT_FLAGS -DNCURSES -DNCURSES_MOUSE_VERSION"
-./configure --libdir=/etc \
+%configure --libdir=/etc \
 	--with-screen=ncurses --enable-warnings \
 	--enable-default-colors --enable-externs \
 	--enable-internal-links --enable-nsl-fork \
@@ -52,8 +63,6 @@ export CFLAGS="-ggdb $RPM_OPT_FLAGS -DNCURSES -DNCURSES_MOUSE_VERSION" CXXFLAGS=
 	--enable-libjs --enable-cgi-links --enable-nls \
 	--enable-ipv6 \
 	--with-ssl=/usr
-# Work around autoconf bug
-echo "#define ANSI_VARARGS 1" >>lynx_cfg.h
 OLD_PO_FILE_INPUT=yes make
 
 %install
@@ -110,10 +119,14 @@ rm -rf $RPM_BUILD_ROOT
 %lang(sk) %config %{_sysconfdir}/lynx.cfg.sk
 
 %changelog
-* Mon Mar  4 2002 Bernhard Rosenkraenzer <bero@redhat.com> 2.8.5-3
-- dev7
-- Fix build with current ncurses
-- Work around autoconf bug
+* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Mon May 13 2002 Bernhard Rosenkraenzer <bero@redhat.com> 2.8.5-3
+- Fix build with current toolchain
 
 * Thu Nov 22 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.8.5-2
 - Update (dev5)