diff --git a/lynx.spec b/lynx.spec
index 80f1791..169a6ab 100644
--- a/lynx.spec
+++ b/lynx.spec
@@ -5,12 +5,8 @@ Release: 19
 License: GPL
 Group: Applications/Internet
 Source: http://lynx.isc.org/current/lynx2.8.5rel.1.tar.bz2
-Source1: lynx.cfg.ja
-Source3: lynx.cfg.cs
-Source4: lynx.cfg.sk
 URL: http://lynx.isc.org/
 Patch0: lynx-2.8.4-redhat.patch
-Patch2: lynx-284-i18ncfg.patch
 Requires: indexhtml
 Provides: webclient
 BuildRequires: openssl-devel, pkgconfig, ncurses-devel >= 5.3-5, slang-devel, zlib-devel
@@ -25,9 +21,9 @@ exits quickly and swiftly displays webpages.
 %prep
 %setup -q -n lynx2-8-5
 %patch0 -p1 -b .redhat
-%patch2 -p1 -b .i18ncfg
 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
 
 %build
 export PATH=`pwd`:$PATH
@@ -62,6 +58,7 @@ fi
 	--enable-justify-elts --enable-scrollbar \
 	--enable-libjs --enable-cgi-links --enable-nls \
 	--enable-ipv6 \
+	--enable-locale-charset \
 	--with-ssl=%{_libdir}
 make %{?_smp_mflags}
 
@@ -70,9 +67,6 @@ rm -rf $RPM_BUILD_ROOT
 chmod -x samples/mailto-form.pl
 %makeinstall mandir=$RPM_BUILD_ROOT%{_mandir}/man1 libdir=$RPM_BUILD_ROOT/etc
 # Install Lang dependent resources
-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/
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Internet
@@ -94,11 +88,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_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
+* Thu Dec 30 2004 Tim Waugh <twaugh@redhat.com>
+- Added --enable-locale-charset compilation option, set LOCALE_CHARSET
+  on in the config file and removed i18ncfg patch (bug #124849).
+
 * Fri Nov 19 2004 Tim Waugh <twaugh@redhat.com> 2.8.5-19
 - 2.8.5rel1.  Fixes bug #139783.