diff --git a/lynx-crash.patch b/lynx-crash.patch
new file mode 100644
index 0000000..dd6e06a
--- /dev/null
+++ b/lynx-crash.patch
@@ -0,0 +1,25 @@
+--- lynx2-8-5/src/HTML.c.crash	2005-01-06 17:03:09.658969996 +0000
++++ lynx2-8-5/src/HTML.c	2005-01-06 17:07:24.096481825 +0000
+@@ -7041,13 +7041,15 @@
+ 	    /*
+ 	     *	Finish the previous option.
+ 	     */
+-	    ptr = HText_setLastOptionValue(me->text,
+-					   me->option.data,
+-					   me->LastOptionValue,
+-					   LAST_ORDER,
+-					   me->LastOptionChecked,
+-					   me->UCLYhndl,
+-					   ATTR_CS_IN);
++	    if (!me->first_option)
++		    ptr = HText_setLastOptionValue(me->text,
++						   me->option.data,
++						   me->LastOptionValue,
++						   LAST_ORDER,
++						   me->LastOptionChecked,
++						   me->UCLYhndl,
++						   ATTR_CS_IN);
++
+ 	    FREE(me->LastOptionValue);
+ 
+ 	    me->LastOptionChecked = FALSE;
diff --git a/lynx.spec b/lynx.spec
index 293e29e..81d7a96 100644
--- a/lynx.spec
+++ b/lynx.spec
@@ -1,12 +1,13 @@
 Summary: A text-based Web browser.
 Name: lynx
 Version: 2.8.5
-Release: 20
+Release: 21
 License: GPL
 Group: Applications/Internet
 Source: http://lynx.isc.org/current/lynx2.8.5rel.1.tar.bz2
 URL: http://lynx.isc.org/
 Patch0: lynx-2.8.4-redhat.patch
+Patch1: lynx-crash.patch
 Requires: indexhtml
 Provides: webclient
 BuildRequires: openssl-devel, pkgconfig, ncurses-devel >= 5.3-5, slang-devel, zlib-devel
@@ -21,6 +22,7 @@ exits quickly and swiftly displays webpages.
 %prep
 %setup -q -n lynx2-8-5
 %patch0 -p1 -b .redhat
+%patch1 -p1 -b .crash
 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
 perl -pi -e 's,^#LOCALE_CHARSET:.*,LOCALE_CHARSET:TRUE,' lynx.cfg
@@ -90,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg
 
 %changelog
+* Thu Jan  6 2005 Tim Waugh <twaugh@redhat.com> 2.8.5-21
+- Fixed <option> handling (bug #90302).
+
 * Thu Dec 30 2004 Tim Waugh <twaugh@redhat.com> 2.8.5-20
 - Added --enable-locale-charset compilation option, set LOCALE_CHARSET
   on in the config file and removed i18ncfg patch (bug #124849).