diff -ur vsftpd-1.0.1.orig/defs.h vsftpd-1.0.1/defs.h
--- vsftpd-1.0.1.orig/defs.h	Sat Aug  4 18:53:32 2001
+++ vsftpd-1.0.1/defs.h	Tue Nov 20 22:56:43 2001
@@ -1,7 +1,7 @@
 #ifndef VSF_DEFS_H
 #define VSF_DEFS_H
 
-#define VSFTP_DEFAULT_CONFIG    "/etc/vsftpd.conf"
+#define VSFTP_DEFAULT_CONFIG    "/etc/vsftpd/vsftpd.conf"
 
 #define VSFTP_COMMAND_FD        0
 
diff -ur vsftpd-1.0.1.orig/tunables.c vsftpd-1.0.1/tunables.c
--- vsftpd-1.0.1.orig/tunables.c	Wed Nov  7 20:24:53 2001
+++ vsftpd-1.0.1/tunables.c	Tue Nov 20 22:57:11 2001
@@ -50,19 +50,19 @@
 unsigned int tunable_anon_max_rate = 0;
 unsigned int tunable_local_max_rate = 0;
 
-const char* tunable_secure_chroot_dir = "/usr/share/empty";
+const char* tunable_secure_chroot_dir = "/usr/share/vsftpd/empty";
 const char* tunable_ftp_username = "ftp";
 const char* tunable_chown_username = "root";
-const char* tunable_xferlog_file = "/var/log/vsftpd.log";
+const char* tunable_xferlog_file = "/var/log/vsftpd/vsftpd.log";
 const char* tunable_message_file = ".message";
 /* XXX -> "secure"? */
 const char* tunable_nopriv_user = "nobody";
 const char* tunable_ftpd_banner = 0;
-const char* tunable_banned_email_file = "/etc/vsftpd.banned_emails";
-const char* tunable_chroot_list_file = "/etc/vsftpd.chroot_list";
-const char* tunable_pam_service_name = "ftp";
+const char* tunable_banned_email_file = "/etc/vsftpd/vsftpd.banned_emails";
+const char* tunable_chroot_list_file = "/etc/vsftpd/vsftpd.chroot_list";
+const char* tunable_pam_service_name = "vsftpd";
 const char* tunable_guest_username = "ftp";
-const char* tunable_userlist_file = "/etc/vsftpd.user_list";
+const char* tunable_userlist_file = "/etc/vsftpd/vsftpd.user_list";
 const char* tunable_anon_root = 0;
 const char* tunable_local_root = 0;
 
diff -ur vsftpd-1.0.1.orig/vsftpd.8 vsftpd-1.0.1/vsftpd.8
--- vsftpd-1.0.1.orig/vsftpd.8	Sun Mar 11 20:14:07 2001
+++ vsftpd-1.0.1/vsftpd.8	Tue Nov 20 22:56:43 2001
@@ -20,7 +20,7 @@
 An optional
 .Op configuration file
 may be given on the command line.  The default configuration file is
-.Pa /etc/vsftpd.conf .
+.Pa /etc/vsftpd/vsftpd.conf .
 .Sh SEE ALSO
 .Xr vsftpd.conf 5
 
diff -ur vsftpd-1.0.1.orig/vsftpd.conf.5 vsftpd-1.0.1/vsftpd.conf.5
--- vsftpd-1.0.1.orig/vsftpd.conf.5	Wed Nov  7 20:30:21 2001
+++ vsftpd-1.0.1/vsftpd.conf.5	Tue Nov 20 22:58:09 2001
@@ -4,7 +4,7 @@
 .SH DESCRIPTION
 vsftpd.conf may be used to control various aspects of vsftpd's behaviour. By
 default, vsftpd looks for this file at the location
-.BR /etc/vsftpd.conf .
+.BR /etc/vsftpd/vsftpd.conf .
 However, you may override this by specifying a command line argument to
 vsftpd. The command line argument is the pathname of the configuration file
 for vsftpd. This behaviour is useful because you may wish to use an advanced
@@ -109,7 +109,7 @@
 different if chroot_local_user is set to YES. In this case, the list becomes
 a list of users which are NOT to be placed in a chroot() jail.
 By default, the file containing this list is
-/etc/vsftpd.chroot_list, but you may override this with the
+/etc/vsftpd/vsftpd.chroot_list, but you may override this with the
 .BR chroot_list_file
 setting.
 
@@ -135,7 +135,7 @@
 .B deny_email_enable
 If activated, you may provide a list of anonymous password e-mail responses
 which cause login to be denied. By default, the file containing this list is
-/etc/vsftpd.banned_emails, but you may override this with the
+/etc/vsftpd/vsftpd.banned_emails, but you may override this with the
 .BR banned_email_file
 setting.
 
@@ -249,7 +249,7 @@
 .TP
 .B xferlog_enable
 If enabled, a log file will be maintained detailling uploads and downloads.
-By default, this file will be placed at /var/log/vsftpd.log, but this location
+By default, this file will be placed at /var/log/vsftpd/vsftpd.log, but this location
 may be overridden using the configuration setting
 .BR xferlog_file .
 
@@ -355,7 +355,7 @@
 .BR deny_email_enable
 is enabled.
 
-Default: /etc/vsftpd.banned_emails
+Default: /etc/vsftpd/vsftpd.banned_emails
 .TP
 .B chown_username
 This is the name of the user who is given ownership of anonymously uploaded
@@ -374,7 +374,7 @@
 .BR chroot_local_user
 is disabled.
 
-Default: /etc/vsftpd.chroot_list
+Default: /etc/vsftpd/vsftpd.chroot_list
 .TP
 .B guest_username
 See the boolean setting
@@ -422,21 +422,21 @@
 .B pam_service_name
 This string is the name of the PAM service vsftpd will use.
 
-Default: ftp
+Default: vsftpd
 .TP
 .B secure_chroot_dir
 This option should be the name of a directory which is empty. Also, the
 directory should not be writable by the ftp user. This directory is used
 as a secure chroot() jail at times vsftpd does not require filesystem access.
 
-Default: /usr/share/empty
+Default: /usr/share/vsftpd/empty
 .TP
 .B userlist_file
 This option is the name of the file loaded when the
 .BR userlist_enable
 option is active.
 
-Default: /etc/vsftpd.user_list
+Default: /etc/vsftpd/vsftpd.user_list
 .TP
 .B xferlog_file
 This option is the name of the file to which we write the transfer log. The
@@ -444,7 +444,7 @@
 .BR xferlog_enable
 is set.
 
-Default: /var/log/vsftpd.log
+Default: /var/log/vsftpd/vsftpd.log
 
 .SH AUTHOR
 chris@scary.beasts.org