diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 0ed21d352b..21a0b7561e 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME?=	fetchmail
 DISTVERSION=	6.4.22
+PORTREVISION=	1
 CATEGORIES=	mail
 # The next line is inherited by the fetchmailconf dependent port,
 # do NOT replace fetchmail by ${PORTNAME}
diff --git a/mail/fetchmail/files/fetchmail.in b/mail/fetchmail/files/fetchmail.in
index 208e4526a6..99756ee8c5 100644
--- a/mail/fetchmail/files/fetchmail.in
+++ b/mail/fetchmail/files/fetchmail.in
@@ -164,10 +164,14 @@ if [ "x${fetchmail_users}" != "x" ]; then
  		eval fetchmail_${i}="\${${uvarname}-\${fetchmail_${i}}}"
 	done
 else
-	pidfile=/var/run/fetchmail/fetchmail.pid
+	fetchmail_home=/var/run/fetchmail
 fi
 required_files=${fetchmail_config}
 
+# set up environment
+export FETCHMAILHOME=${fetchmail_home}
+export FETCHMAILUSER=${fetchmail_user}
+
 # add early command line arguments
 # if logfile set in config file, do not override with rc.conf default (note logfile overrides syslog)
 _logfile="$(fetchmail_dump_config logfile)"
@@ -184,5 +188,4 @@ if [ "$(fetchmail_dump_config poll_interval)" = "0," ] ; then
 fi
 
 # actually execute the fetchmail program
-export FETCHMAILUSER=$fetchmail_user
 run_rc_command "$1"