diff --git a/sysutils/zrepl/Makefile b/sysutils/zrepl/Makefile
index 124fc8f2ef..23b3cc16c6 100644
--- a/sysutils/zrepl/Makefile
+++ b/sysutils/zrepl/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=      zrepl
 DISTVERSIONPREFIX=     v
 DISTVERSION=   0.4.0
-PORTREVISION=  1
+PORTREVISION=  2
 CATEGORIES=    sysutils
 
 MAINTAINER=    lcook@FreeBSD.org
diff --git a/sysutils/zrepl/files/zrepl.in b/sysutils/zrepl/files/zrepl.in
index 57a4d48ce0..095a43f0d6 100644
--- a/sysutils/zrepl/files/zrepl.in
+++ b/sysutils/zrepl/files/zrepl.in
@@ -40,7 +40,7 @@ load_rc_config $name
 : ${zrepl_priority:="alert"}
 : ${zrepl_options:="${zrepl_flags} --config ${zrepl_config}"}
 
-pidfile="/var/run/zrepl/daemon.pid"
+pidfile="/var/run/zrepl.pid"
 command="/usr/sbin/daemon"
 procname="%%PREFIX%%/bin/zrepl"
 command_args="-p ${pidfile} %%DAEMON_LOGGING%% ${procname} ${zrepl_options} daemon"
@@ -54,8 +54,8 @@ extra_commands="configtest"
 zrepl_precmd()
 {
        if [ ! -d "/var/run/zrepl/stdinserver" ]; then
-               install -d -g ${zrepl_group} -o ${zrepl_user} -m 0755 -- "/var/run/zrepl";
-               install -d -g ${zrepl_group} -o ${zrepl_user} -m 0755 -- "/var/run/zrepl/stdinserver";
+               install -d -g ${zrepl_group} -o ${zrepl_user} -m 0700 -- "/var/run/zrepl";
+               install -d -g ${zrepl_group} -o ${zrepl_user} -m 0700 -- "/var/run/zrepl/stdinserver";
        fi
 
        if [ ! -e "${pidfile}" ]; then