diff --git a/vsftpd.ftpusers b/vsftpd.ftpusers
new file mode 100644
index 0000000..096142f
--- /dev/null
+++ b/vsftpd.ftpusers
@@ -0,0 +1,15 @@
+# Users that are not allowed to login via ftp
+root
+bin
+daemon
+adm
+lp
+sync
+shutdown
+halt
+mail
+news
+uucp
+operator
+games
+nobody
diff --git a/vsftpd.pam b/vsftpd.pam
index 1dcd822..02db61b 100644
--- a/vsftpd.pam
+++ b/vsftpd.pam
@@ -1,5 +1,5 @@
 #%PAM-1.0
-auth       required	/lib/security/pam_listfile.so item=user sense=deny file=/etc/vsftpd.user_list onerr=succeed
+auth       required	/lib/security/pam_listfile.so item=user sense=deny file=/etc/vsftpd.ftpusers onerr=succeed
 auth       required	/lib/security/pam_stack.so service=system-auth
 auth       required	/lib/security/pam_shells.so
 account    required	/lib/security/pam_stack.so service=system-auth
diff --git a/vsftpd.spec b/vsftpd.spec
index ca736f4..e0c0890 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -1,16 +1,19 @@
+%define optflags -g
 Summary: vsftpd - Very Secure Ftp Daemon
 Name: vsftpd
 Version: 1.0.1
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Daemons
 URL: ftp://ferret.lmh.ox.ac.uk/pub/linux/
 Source: %{name}-%{version}.tar.gz
 Source1: vsftpd.xinetd
 Source2: vsftpd.pam
-Source3: vsftpd.user_list
+Source3: vsftpd.ftpusers
+Source4: vsftpd.user_list
 Patch1: vsftpd-1.0.1-rh.patch
 Patch2: vsftpd-1.0.1-missingok.patch
+Patch3: vsftpd-1.0.1-anon.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: xinetd, logrotate
 Provides: ftpserver
@@ -23,6 +26,7 @@ scratch.
 %setup -q -n %{name}-%{version}
 %patch1 -p1 -b .rh
 %patch2 -p1 -b .mok
+%patch3 -p1 -b .anon
 
 %build
 make
@@ -43,7 +47,8 @@ install -m 644 vsftpd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
 install -m 644 RedHat/vsftpd.log $RPM_BUILD_ROOT/etc/logrotate.d/vsftpd.log
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/xinetd.d/vsftpd
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/vsftpd
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/vsftpd.user_list
+install -m 600 %{SOURCE3} $RPM_BUILD_ROOT/etc/vsftpd.ftpusers
+install -m 600 %{SOURCE4} $RPM_BUILD_ROOT/etc/vsftpd.user_list
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -60,6 +65,10 @@ install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/vsftpd.user_list
 %{_mandir}/man8/vsftpd.*
 
 %changelog
+* Wed Apr 10 2002 Bill Nottingham <notting@redhat.com> 1.0.1-5
+- don't spit out ugly errors if anonftp isn't installed (#62987)
+- fix horribly broken userlist setup (#62321)
+
 * Thu Feb 28 2002 Trond Eivind Glomsr�d <teg@redhat.com> 1.0.1-4
 - s/Copyright/License/
 - add "missingok" to the logrotate script, so we don't get errors
diff --git a/vsftpd.user_list b/vsftpd.user_list
index 856df2f..d283e3d 100644
--- a/vsftpd.user_list
+++ b/vsftpd.user_list
@@ -1,3 +1,9 @@
+# vsftpd userlist
+# If userlist_deny=NO, only allow users in this file
+# If userlist_deny=YES (default), never allow users in this file, and
+# do not even prompt for a password.
+# Note that the default vsftpd pam config also checks /etc/vsftpd.ftpusers
+# for users that are denied.
 root
 bin
 daemon