diff --git a/configure.ac b/configure.ac
index 7631ebe..70a97d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,7 +120,7 @@ cat <<EOF
  $PACKAGE_NAME version $PACKAGE_VERSION
   Prefix.........: $prefix
   Sysconfdir.....: `eval echo $sysconfdir`
-  Localstatedir..: `eval echo $localstatedir`
+  Runstatedir....: `eval echo $runstatedir`
   C Compiler.....: $CC $CFLAGS $CPPFLAGS $LDFLAGS $LIBS
 
  Optional features:
diff --git a/lib/pidfile.c b/lib/pidfile.c
index cd1c633..81f2315 100644
--- a/lib/pidfile.c
+++ b/lib/pidfile.c
@@ -50,7 +50,7 @@ static pid_t pidfile_pid  = 0;
 
 static void pidfile_cleanup(void);
 
-const  char *__pidfile_path = LOCALSTATEDIR "/run";
+const  char *__pidfile_path = RUNSTATEDIR;
 const  char *__pidfile_name = NULL;
 
 int
diff --git a/src/Makefile.am b/src/Makefile.am
index 8dba200..6e2a51c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,7 @@ endif
 
 AM_CFLAGS             = -W -Wall -Wextra
 AM_CFLAGS            += -Wno-unused-result -Wno-unused-parameter -fno-strict-aliasing
-AM_CPPFLAGS           = -DSYSCONFDIR=\"@sysconfdir@\" -DLOCALSTATEDIR=\"@localstatedir@\"
+AM_CPPFLAGS           = -DSYSCONFDIR=\"@sysconfdir@\" -DRUNSTATEDIR=\"@runstatedir@\"
 AM_CPPFLAGS          += -D_BSD_SOURCE -D_DEFAULT_SOURCE
 
 syslogd_SOURCES       = syslogd.c syslogd.h socket.c socket.h syslog.h queue.h compat.h
diff --git a/src/klogd.c b/src/klogd.c
index 7c4e3c2..39dfd48 100644
--- a/src/klogd.c
+++ b/src/klogd.c
@@ -45,7 +45,7 @@
 
 static struct syslog_data log = SYSLOG_DATA_INIT;
 
-static char *PidFile = LOCALSTATEDIR "/run/klogd.pid";
+static char *PidFile = RUNSTATEDIR "/klogd.pid";
 
 static int kmsg;
 static int change_state      = 0;
diff --git a/src/syslogd.h b/src/syslogd.h
index 2b4be3c..4271206 100644
--- a/src/syslogd.h
+++ b/src/syslogd.h
@@ -72,7 +72,7 @@
 #endif
 
 #ifndef _PATH_LOGPID
-#define _PATH_LOGPID LOCALSTATEDIR "/run/syslogd.pid"
+#define _PATH_LOGPID RUNSTATEDIR "/syslogd.pid"
 #endif
 
 #ifndef _PATH_DEV