diff --git pure-ftpd/man/pure-ftpd.8 pure-ftpd/man/pure-ftpd.8

index 022065f..c60b58f 100644

--- pure-ftpd/man/pure-ftpd.8

+++ pure-ftpd/man/pure-ftpd.8

@@ -306,7 +306,7 @@ For external authentication handlers.

 .br

 Different authentication methods can be mixed together. For instance if you

 run the server with

-.I -lpuredb:/etc/pwd.pdb -lmysql:/etc/my.cf -lunix

+.I -lpuredb:/etc/pure-ftpd/pureftpd.pdb -lmysql:/etc/pure-ftpd/pureftpd-mysql.conf -lunix

 Accounts will first be authenticated from a PureDB database. If it fails, a

 MySQL server will be asked. If the account is still not found is the

 database, standard unix accounts will be scanned. Authentication methods are

@@ -370,17 +370,17 @@ Stats, W3C and xferlog.

 .br

 If you add

 .br

-\fB\-O clf:/var/log/pureftpd.log\fR

+\fB\-O clf:/var/log/pure-ftpd/pureftpd.log\fR

 .br

 to your starting options,

 Pure-FTPd will log transfers in

-\fB/var/log/pureftpd.log\fR

+\fB/var/log/pure-ftpd/pureftpd.log\fR

 in a format similar to

 the Apache web server in default configuration.

 .br

 If you add

 .br

-\fB\-O stats:/var/log/pureftpd.log\fR

+\fB\-O stats:/var/log/pure-ftpd/pureftpd.log\fR

 .br

 to your starting options,

 Pure-FTPd will create accurate log files designed for traffic analys

@@ -388,14 +388,14 @@ software like ftpStats.

 .br

 If you add

 .br

-\fB\-O w3c:/var/log/pureftpd.log\fR

+\fB\-O w3c:/var/log/pure-ftpd/pureftpd.log\fR

 .br

 to your starting options,

 Pure-FTPd will create W3C\-conformant log files.

 .br

 For security purposes, the path must be absolute

 (eg.

-\fB/var/log/pureftpd.log\fR, not \fB ../log/pureftpd.log\fR).

+\fB/var/log/pure-ftpd/pureftpd.log\fR, not \fB ../log/pure-ftpd/pureftpd.log\fR).

 .TP

 .B \-p first:last

 Use only ports in the range \fIfirst\fR to \fIlast\fR

@@ -554,7 +554,7 @@ Add safe guards against common customer mistakes (like chmod 0 on their own file

 Some of the complexities of older servers are left out.

 .PP

 This version of pure\-ftpd can use PAM for authentication. If you wan't it to

-consult any files like /etc/shells or /etc/ftpd/ftpusers consult pam

+consult any files like /etc/shells or /etc/ftpusers consult pam

 docs. LDAP directories and SQL databases are also supported.

 .PP

 Anonymous users are authenticated in any of three ways:

@@ -565,7 +565,7 @@ does not ask anonymous users for an email address or other password.

 .PP

 2. The user connects to an IP address which resolves to the name of a

 directory in

-.I /etc/pure\-ftpd

+.I /etc/pure\-ftpd/vhost

 (or a symlink in that directory to a real directory), and there is an

 account called "ftp" (which does not need to have a valid home

 directory). See

@@ -617,7 +617,7 @@ Shortcuts for the "cd" command can be set up if the server has been compiled

 with the \-\-with\-diraliases feature.

 .PP

 To enable directory aliases, create a file called

-.I /etc/pureftpd\-dir\-aliases

+.I /etc/pure\-ftpd/pureftpd\-dir\-aliases

 and alternate lines of alias names and associated directories.

 .SH "ANONYMOUS FTP"

@@ -703,7 +703,7 @@ uses this account to set the anonymous users' uid.

 2. Create a directory as described in

 .B Anonymous FTP

 and make a symlink called

-.I /etc/pure\-ftpd/10.11.12.13

+.I /etc/pure\-ftpd/vhost/10.11.12.13

 which points to this directory.

 .PP

 3. Make sure your kernel has support for IP aliases.

@@ -717,7 +717,7 @@ That should be all. If you have problems, here are some things to

 try.

 .PP

 First, symlink

-.I /etc/pure\-ftpd/127.0.0.1

+.I /etc/pure\-ftpd/vhost/127.0.0.1

 to some directory and say "ftp localhost". If that doesn't log you

 in, the problem is with

 .B ftpd.

@@ -738,7 +738,7 @@ If you setup a virtual hosts, normal users will not be able to login via

 this name, so

 .B don't

 create link/directory in

-.I /etc/pure\-ftpd

+.I /etc/pure\-ftpd/vhost

 for your regular hostname.

 .SH "FILES"

@@ -762,7 +762,7 @@ or

 .B \-p

 options are used

 .PP

-.I /etc/pure\-ftpd/<ip address>

+.I /etc/pure\-ftpd/vhost/<ip address>

 is the base directory for the <ip address> virtual ftp server, or a

 symbolic link to its base directory.

 .B Ftpd

diff --git pure-ftpd/man/pure-pw.8 pure-ftpd/man/pure-pw.8

index b95031e..d77e5fc 100644

--- pure-ftpd/man/pure-pw.8

+++ pure-ftpd/man/pure-pw.8

@@ -49,9 +49,9 @@ Thousands of virtual users can share the same system user, as long as they

 all are chrooted, and they have their own home directory.

 .SH "FILES"

 .LP 

-\fI/etc/pureftpd.passwd\fP

+\fI/etc/pure-ftpd/pureftpd.passwd\fP

 .br

-\fI/etc/pureftpd.pdb\fP 

+\fI/etc/pure-ftpd/pureftpd.pdb\fP 

 .SH "ENVIRONMENT VARIABLES"

 .LP 

 \fIPURE_PASSWDFILE\fP

diff --git pure-ftpd/man/pure-statsdecode.8 pure-ftpd/man/pure-statsdecode.8

index 5935e66..4e519f0 100644

--- pure-ftpd/man/pure-statsdecode.8

+++ pure-ftpd/man/pure-statsdecode.8

@@ -23,11 +23,11 @@ is a log file produced with pure\-ftpd \-O ftpstats:/path/to/logfile

 .LP 

 To run this program the standard way type:

 .LP 

-pure\-statsdecode /var/log/pureftpd.log > /tmp/pureftpd.humanlog

+pure\-statsdecode /var/log/pure-ftpd/pureftpd.log > /tmp/pureftpd.humanlog

 .LP 

 Alternativly you can run it as:

 .LP 

-cat /var/log/pureftpd.log | pure\-statsdecode \- | gzip \-\-best > /tmp/pureftpd.humanlog.gz

+cat /var/log/pure-ftpd/pureftpd.log | pure\-statsdecode \- | gzip \-\-best > /tmp/pureftpd.humanlog.gz

 .SH "AUTHORS"

 .LP