diff --git a/.cvsignore b/.cvsignore
index f9e9f49..5cd8ecc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 lynx2-8-2.ja.po.bz2
-lynx2.8.4dev.16.tar.bz2
+lynx2.8.4pre.5.tar.bz2
diff --git a/lynx.spec b/lynx.spec
index a0cc449..86119db 100644
--- a/lynx.spec
+++ b/lynx.spec
@@ -1,20 +1,23 @@
 Summary: A text-based Web browser.
 Name: lynx
 Version: 2.8.4
-Release: 9.1
-Copyright: GPL
+Release: 16
+License: GPL
 Group: Applications/Internet
-Source: http://lynx.isc.org/current/lynx2.8.4dev.16.tar.bz2
+Source: http://lynx.isc.org/current/lynx2.8.4pre.5.tar.bz2
 Source1: lynx.cfg.ja
-SOurce2: lynx2-8-2.ja.po.bz2
+Source2: lynx2-8-2.ja.po.bz2
+Source3: lynx.cfg.cs
+Source4: lynx.cfg.sk
 URL: http://lynx.isc.org/
 Patch0: lynx2-8-3-redhat.patch
 Patch1: lynx2-8-2-telnet.patch
 Patch2: lynx-284-i18ncfg.patch
-Patch3: lynx-2.8.4dev16-crlf.patch
+Patch3: lynx-284-ipv6-salen.patch
+Patch4: lynx-2.8.4-sitecfg.patch
 Requires: indexhtml
 Provides: webclient
-BuildRequires: openssl-devel, ncurses-devel
+BuildRequires: openssl-devel, ncurses-devel, slang-devel, zlib-devel
 Buildroot: %{_tmppath}/%{name}-root
 
 %description
@@ -31,14 +34,15 @@ Install lynx if you would like to try this fast, non-graphical browser
 %patch0 -p0
 %patch1 -p1 -b .telnet
 %patch2 -p1 -b .i18ncfg
-%patch3 -p1 -b .crlf
+%patch3 -p1 -b .salen
+%patch4 -p1 -b .sitecfg
 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 CFLAGS="-ggdb $RPM_OPT_FLAGS" CXXFLAGS="-ggdb $RPM_OPT_FLAGS"
+export CFLAGS="-ggdb $RPM_OPT_FLAGS -DNCURSES -DNCURSES_MOUSE_VERSION" CXXFLAGS="-ggdb $RPM_OPT_FLAGS -DNCURSES -DNCURSES_MOUSE_VERSION"
 %configure --libdir=/etc \
-	--with-screen=slang --enable-warnings \
+	--with-screen=ncurses --enable-warnings \
 	--enable-default-colors --enable-externs \
 	--enable-internal-links --enable-nsl-fork \
 	--enable-persistent-cookies --enable-prettysrc \
@@ -49,14 +53,17 @@ export CFLAGS="-ggdb $RPM_OPT_FLAGS" CXXFLAGS="-ggdb $RPM_OPT_FLAGS"
 	--enable-addrlist-page --enable-cjk \
 	--enable-justify-elts --enable-scrollbar \
 	--enable-libjs --enable-cgi-links --enable-nls \
+	--enable-ipv6 \
 	--with-ssl=/usr
-make
+OLD_PO_FILE_INPUT=yes make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall mandir=$RPM_BUILD_ROOT%{_mandir}/man1 libdir=$RPM_BUILD_ROOT/etc
 # Install Lang dependent resources
-install -m444 %{SOURCE1} $RPM_BUILD_ROOT/etc/lynx.cfg.ja
+install -m444 %{SOURCE1} $RPM_BUILD_ROOT/etc
+install -m444 %{SOURCE3} $RPM_BUILD_ROOT/etc
+install -m444 %{SOURCE4} $RPM_BUILD_ROOT/etc
 mkdir -p $RPM_BUILD_ROOT/usr/share/locale/ja/LC_MESSAGES/
 ( bzcat %{SOURCE2} | msgfmt -o $RPM_BUILD_ROOT/usr/share/locale/ja/LC_MESSAGES/lynx.mo - )
 
@@ -64,9 +71,6 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Internet
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Internet/lynx.desktop <<EOF
 [Desktop Entry]
 Name=Lynx
-Name[de]=Lynx
-Name[ja]=Lynx
-Name[sv]=Lynx
 Type=Application
 Comment=Text based WWW browser
 Comment[de]=Textbasierter WWW-Browser
@@ -76,6 +80,10 @@ Exec=lynx
 Terminal=true
 EOF
 
+cat >$RPM_BUILD_ROOT%{_sysconfdir}/lynx-site.cfg <<EOF
+# Place any local lynx configuration options (proxies etc.) here.
+EOF
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -97,11 +105,36 @@ rm -rf $RPM_BUILD_ROOT
 %lang(sv) %{_prefix}/share/locale/sv/LC_MESSAGES/*
 %{_mandir}/*/*
 %config %{_sysconfdir}/lynx.cfg
+%config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg
 %lang(ja) %config %{_sysconfdir}/lynx.cfg.ja
+%lang(cs) %config %{_sysconfdir}/lynx.cfg.cs
+%lang(sk) %config %{_sysconfdir}/lynx.cfg.sk
 
 %changelog
-* Wed Jan 22 2003 Tim Waugh <twaugh@redhat.com> 2.8.4-9.1
-- Fix CRLF issue.
+* Thu Jul 19 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.8.4-16
+- update to 2.8.4p5 (bugfix release)
+
+* Tue Jul 10 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.8.4-15
+- Add site-cfg file (#43841)
+
+* Sun Jun 24 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.8.4-14
+- 2.8.4p2
+
+* Thu Jun 07 2001 Florian La Roche <Florian.LaRoche@redhat.de>
+- support newer gettext version
+
+* Thu May  3 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.8.4-12
+- --with-display=ncurses, fixes #37481
+
+* Wed May  2 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.8.4-11
+- Add Czech/Slovak patches from milan.kerslager@spsselib.hiedu.cz (RFE#38334)
+
+* Sun Apr 15 2001 Bernhard Rosenkraenzer <bero@redhat.com>
+- dev20
+- Add ipv6 patches from Pekka Savola <pekkas@netcore.fi>:
+  - enable ipv6, patch for missing sockaddr sa_len
+  - buildrequires: slang-devel, zlib-devel
+  (Bug #35644)
 
 * Fri Mar  2 2001 Nalin Dahyabhai <nalin@redhat.com>
 - rebuild in new environment
diff --git a/sources b/sources
index 7566f6a..1071c54 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 2201d137b3df5fa07c435595294c3083  lynx2-8-2.ja.po.bz2
-8db0588e3ce75a92455b33a11c0f6703  lynx2.8.4dev.16.tar.bz2
+84848c8b718aff6960753711b2dbde61  lynx2.8.4pre.5.tar.bz2