diff --git a/.cvsignore b/.cvsignore
index 0536ce4..069995c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-samba-2.0.7-ja-1.2a.tar.bz2
+samba-2.0.7.tar.gz
diff --git a/samba.spec b/samba.spec
index 95c7b0d..b6b1328 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,18 +1,13 @@
-%define enable_japanese 1
-
 %define initdir /etc/rc.d/init.d
 %define auth %(test -f /etc/pam.d/system-auth && echo /etc/pam.d/system-auth || echo)
-%define jpver ja-1.2a
 
 Summary: Samba SMB server.
 Name: samba
 Version: 2.0.7
-Release: 21sslj1
+Release: 22
 Copyright: GNU GPL Version 2
 Group: System Environment/Daemons
-#Source: ftp://us2.samba.org/pub/samba/samba-%{version}.tar.gz
-# Source 
-Source: http://www.samba.gr.jp/pub/samba-jp/samba-2.0.7-ja/samba-%{version}-%{jpver}.tar.bz2
+Source: ftp://us2.samba.org/pub/samba/samba-%{version}.tar.gz
 Source1: samba.log
 Source2: samba.xinetd
 Patch: samba-makefilepath.patch
@@ -30,8 +25,7 @@ Patch11: samba-2.0.7-nocups.patch
 Patch12: samba-2.0.7-smbadduser.patch
 Patch13: samba-2.0.7-krb5-1.2.patch
 Patch14: samba-2.0.7-ssl.patch
-# Japanese patch
-Patch20: samba-autoconf-jp.patch
+Patch15: samba-2.0.7-buildroot.patch
 Requires: pam >= 0.64 %{auth} samba-common = %{version} 
 Requires: logrotate >= 3.4
 BuildPrereq: openssl-devel, krb5-devel
@@ -81,16 +75,12 @@ Samba-common provides files necessary for both the server and client
 packages of Samba.
 
 %prep
-%setup -q -n samba-%{version}-%{jpver}
+%setup -q
 %patch -p1 -b .makefile
 %patch1 -p1 -b .smbw
 %patch2 -p1 -b .glibc21
 %patch3 -p1 -b .fixinit
-%if %{enable_japanese}
-%patch20 -p1 -b .autoconf-jp
-%else
 %patch4 -p1 -b .autoconf
-%endif
 %patch5 -p1 -b .gawk
 %patch6 -p1 -b .smbprint
 %patch7 -p1 -b .logrotate
@@ -101,6 +91,7 @@ packages of Samba.
 %patch12 -p1 -b .smbadduser
 %patch13 -p1 -b .krb5-1.2
 %patch14 -p1 -b .ssl
+%patch15 -p1 -b .buildroot
 
 %build
 cd source
@@ -165,7 +156,7 @@ cat > $RPM_BUILD_ROOT/etc/X11/applnk/System/swat.desktop <<EOF
 Name=Samba Configuration
 Type=Application
 Comment=The Swat Samba Administration Tool
-Exec=netscape http://localhost:901/
+Exec=netscape http://127.0.0.1:901/
 Terminal=false
 EOF
 
@@ -275,8 +266,9 @@ fi
 %{_mandir}/man5/lmhosts.5*
 
 %changelog
-* Thu Aug 31 2000 Yukihiro Nakai <ynakai@redhat.com>
-- Use Japanized samba from http://www.samba.gr.jp/
+* Mon Oct 16 2000 Bill Nottingham <notting@redhat.com>
+- fix swat only_from line (#18726, others)
+- fix attempt to write outside buildroot on install (#17943)
 
 * Mon Aug 14 2000 Bill Nottingham <notting@redhat.com>
 - add smbspool back in (#15827)
diff --git a/samba.xinetd b/samba.xinetd
index 8c38b35..7431aaa 100644
--- a/samba.xinetd
+++ b/samba.xinetd
@@ -7,7 +7,7 @@ service swat
 	port	= 901
 	socket_type	= stream
 	wait 	= no
-	only_from = localhost
+	only_from = 127.0.0.1
 	user	= root
 	server	= /usr/sbin/swat
 	log_on_failure	+= USERID
diff --git a/sources b/sources
index c783a4c..5d29280 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f2bcd6af2b10ae50cf657eb2d33893fd  samba-2.0.7-ja-1.2a.tar.bz2
+b5e61ea655d476072fd0365785fea2d0  samba-2.0.7.tar.gz