diff --git a/lynx.spec b/lynx.spec
index de3940e..bec4e74 100644
--- a/lynx.spec
+++ b/lynx.spec
@@ -1,13 +1,18 @@
+%define enable_japanese 1
+
 Summary: A text-based Web browser.
 Name: lynx
 Version: 2.8.4
-Release: 3
+Release: 3j2
 Copyright: GPL
 Group: Applications/Internet
 Source0: http://sol.slcc.edu/lynx/current/lynx%{version}dev.7.tar.bz2
 URL: http://lynx.isc.org/
 Patch0: lynx2-8-3-redhat.patch
 Patch1: lynx2-8-2-telnet.patch
+# Japanese patch
+Patch10:  lynx2-8-3-charset.patch
+Patch20:  lynx2-8-3-configure.patch
 Requires: indexhtml
 Provides: webclient
 Buildroot: %{_tmppath}/%{name}-root
@@ -25,10 +30,14 @@ Install lynx if you would like to try this fast, non-graphical browser
 %setup -q -n lynx2-8-4
 %patch0 -p0
 %patch1 -p1 -b .telnet
+%if %{enable_japanese}
+%patch10 -p1 -b .jp
+%patch20 -p1 -b .slang-j
+%endif
 
 %build
 %configure --libdir=/etc \
-	--with-screen=slang --enable-warnings \
+	--with-screen=slang-j --enable-warnings \
 	--enable-default-colors --enable-externs \
 	--enable-internal-links --enable-nsl-fork \
 	--enable-persistent-cookies --enable-prettysrc \
@@ -69,6 +78,12 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_sysconfdir}/lynx.cfg
 
 %changelog
+* Mon Sep 11 2000 Mitsuo Hamada <mhamada@redhat.com>
+- Build with libslang-j
+
+* Thu Aug 31 2000 Yukihiro Nakai <ynakai@redhat.com>
+- Add a patch to set Japanese to default.
+
 * Fri Aug  4 2000 Bernhard Rosenkraenzer <bero@redhat.com>
 - Add Swedish and German translations to desktop file, Bug 15322