diff -ur proftpd-1.3.5.orig/configure.in proftpd-1.3.5/configure.in
--- proftpd-1.3.5.orig/configure.in	2014-01-17 18:04:19.000000000 +0000
+++ proftpd-1.3.5/configure.in	2014-06-02 11:03:41.577869556 +0000
@@ -2970,7 +2970,7 @@
 locale_dir="`eval echo ${locale_dir}`"
 AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`")
 
-AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`")
+AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}/proftpd"`")
 AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`")
 AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`")
 
diff -ur proftpd-1.3.5.orig/contrib/xferstats.holger-preiss proftpd-1.3.5/contrib/xferstats.holger-preiss
--- proftpd-1.3.5.orig/contrib/xferstats.holger-preiss	2013-09-17 21:53:59.000000000 +0000
+++ proftpd-1.3.5/contrib/xferstats.holger-preiss	2014-06-02 11:03:41.576869727 +0000
@@ -52,7 +52,7 @@
 # If you want to specify $mydom1 and $mydom2 manually you should edit the
 # next two lines to customize for your domain. This will allow your domain
 # to be separated in the domain listing.
-# $mydom1 = "debian";
+# $mydom1 = "tld";
 # $mydom2 = "org";
 
 # edit the next line to customize for your default log file
diff -ur proftpd-1.3.5.orig/include/default_paths.h proftpd-1.3.5/include/default_paths.h
--- proftpd-1.3.5.orig/include/default_paths.h	2011-05-23 20:35:35.000000000 +0000
+++ proftpd-1.3.5/include/default_paths.h	2014-06-02 11:03:41.576869727 +0000
@@ -57,7 +57,7 @@
  * overriden at runtime with the '-c' switch
  */
 #ifndef PR_CONFIG_FILE_PATH
-# define PR_CONFIG_FILE_PATH	"/etc/proftpd.conf"
+# define PR_CONFIG_FILE_PATH	"/etc/ftpd/proftpd.conf"
 #endif
 
 /* The location of your `shells' file; a newline delimited list of
@@ -80,6 +80,6 @@
 /* Location of the file containing users that *cannot* use ftp
  * services (odd, eh?)
  */
-#define PR_FTPUSERS_PATH	"/etc/ftpusers"
+#define PR_FTPUSERS_PATH	"/etc/ftpd/ftpusers"
 
 #endif /* PROFTPD_PATHS_H */
diff -ur proftpd-1.3.5.orig/Make.rules.in proftpd-1.3.5/Make.rules.in
--- proftpd-1.3.5.orig/Make.rules.in	2013-02-06 06:51:04.000000000 +0000
+++ proftpd-1.3.5/Make.rules.in	2014-06-02 11:03:41.578869373 +0000
@@ -11,6 +11,7 @@
 localedir=@localedir@
 localstatedir=@localstatedir@
 pkgconfigdir=@pkgconfigdir@
+rundir=@localstatedir@/proftpd
 mandir=@mandir@
 
 AR=@AR@