diff -urNpa proftpd-1.3.6.orig/configure.in proftpd-1.3.6/configure.in
--- proftpd-1.3.6.orig/configure.in	2017-04-10 02:31:02.000000000 +0000
+++ proftpd-1.3.6/configure.in	2017-12-30 22:51:10.151946983 +0000
@@ -3832,7 +3832,7 @@ locale_dir="`eval echo ${localedir}`"
 locale_dir="`eval echo ${locale_dir}`"
 AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`", [Define the locale directory])
 
-AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`", [Define the run directory])
+AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}/proftpd"`", [Define the run directory])
 AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`", [Define the configuration file path])
 AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`", [Define the PID file path])
 
diff -urNpa proftpd-1.3.6.orig/contrib/xferstats.holger-preiss proftpd-1.3.6/contrib/xferstats.holger-preiss
--- proftpd-1.3.6.orig/contrib/xferstats.holger-preiss	2017-04-10 02:31:02.000000000 +0000
+++ proftpd-1.3.6/contrib/xferstats.holger-preiss	2017-12-30 22:53:57.686936997 +0000
@@ -52,7 +52,7 @@ $mydom1 = pop(@mydom);
 # 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-linux";
 # $mydom2 = "org";
 
 # edit the next line to customize for your default log file
diff -urNpa proftpd-1.3.6.orig/include/default_paths.h proftpd-1.3.6/include/default_paths.h
--- proftpd-1.3.6.orig/include/default_paths.h	2017-04-10 02:31:02.000000000 +0000
+++ proftpd-1.3.6/include/default_paths.h	2017-12-30 22:51:59.526944040 +0000
@@ -56,7 +56,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
@@ -78,13 +78,13 @@
 /* Location of the file that tells proftpd to discontinue servicing
  * requests.
  */
-#define PR_SHUTMSG_PATH		"/etc/shutmsg"
+#define PR_SHUTMSG_PATH		"/etc/ftpd/shutmsg"
 
 /* Location of the file containing users that *cannot* use ftp
  * services (odd, eh?)
  */
 #ifndef PR_FTPUSERS_PATH
-# define PR_FTPUSERS_PATH	"/etc/ftpusers"
+# define PR_FTPUSERS_PATH	"/etc/ftpd/ftpusers"
 #endif
 
 #endif /* PROFTPD_PATHS_H */
diff -urNpa proftpd-1.3.6.orig/Make.rules.in proftpd-1.3.6/Make.rules.in
--- proftpd-1.3.6.orig/Make.rules.in	2017-04-10 02:31:02.000000000 +0000
+++ proftpd-1.3.6/Make.rules.in	2017-12-30 22:51:10.152946983 +0000
@@ -11,6 +11,7 @@ libexecdir=@libexecdir@
 localedir=@localedir@
 localstatedir=@localstatedir@
 pkgconfigdir=@pkgconfigdir@
+rundir=@localstatedir@/proftpd
 mandir=@mandir@
 
 AR=@AR@