diff -ur rsync-3.0.8.orig/rsync.h rsync-3.0.8/rsync.h
--- rsync-3.0.8.orig/rsync.h	2011-02-21 20:32:51.000000000 +0100
+++ rsync-3.0.8/rsync.h	2011-04-07 10:21:07.794002236 +0200
@@ -29,7 +29,7 @@
 /* RSYNCD_SYSCONF is now set in config.h */
 #define RSYNCD_USERCONF "rsyncd.conf"
 
-#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
+#define DEFAULT_LOCK_FILE "/var/lock/rsyncd.lock"
 #define URL_PREFIX "rsync://"
 
 #define SYMLINK_PREFIX "/rsyncd-munged/"  /* This MUST have a trailing slash! */
diff -ur rsync-3.0.8.orig/rsyncd.conf.5 rsync-3.0.8/rsyncd.conf.5
--- rsync-3.0.8.orig/rsyncd.conf.5	2011-03-26 22:37:52.000000000 +0100
+++ rsync-3.0.8/rsyncd.conf.5	2011-04-07 10:21:07.789502107 +0200
@@ -632,7 +632,7 @@ require that you specify a group passwor
 passwords.
 .IP
 There is no default for the "secrets file" parameter, you must choose a
-name (such as \fB/etc/rsyncd.secrets\fP).  The file must normally not be
+name (such as \fB/etc/rsyncd/rsyncd.secrets\fP).  The file must normally not be
 readable by "other"; see "strict modes".  If the file is not found or is
 rejected, no logins for a "user auth" module will be possible.
 .IP "\fBstrict\ modes\fP"
@@ -1092,7 +1092,7 @@ that can be included into multiple modul
 global values that will affect connections (such as \fBmotd\ file\fP), or globals
 that will affect other include files.
 .P
-For example, this is a useful /etc/rsyncd.conf file:
+For example, this is a useful /etc/rsyncd/rsyncd.conf file:
 .RS 4
 .P
 .nf
@@ -1219,11 +1219,11 @@ pid file = /var/run/rsyncd.pid
         path = /data/cvs
         comment = CVS repository (requires authentication)
         auth users = tridge, susan
-        secrets file = /etc/rsyncd.secrets
+        secrets file = /etc/rsyncd/rsyncd.secrets
 .fi
 .RE
 .P
-The /etc/rsyncd.secrets file would look something like this:
+The /etc/rsyncd/rsyncd.secrets file would look something like this:
 .RS 4
 .P
 .nf
@@ -1234,7 +1234,7 @@ susan:herpass
 .P
 .SH "FILES"
 .P
-/etc/rsyncd.conf or rsyncd.conf
+/etc/rsyncd/rsyncd.conf or rsyncd.conf
 .P
 .SH "SEE ALSO"
 .P