Index: head/sysutils/puppetserver5/Makefile
===================================================================
--- head/sysutils/puppetserver5/Makefile
+++ head/sysutils/puppetserver5/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	puppetserver
 PORTVERSION=	5.3.7
+PORTREVISION=	1
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppet/
 PKGNAMESUFFIX=	5
Index: head/sysutils/puppetserver5/files/puppetserver.in
===================================================================
--- head/sysutils/puppetserver5/files/puppetserver.in
+++ head/sysutils/puppetserver5/files/puppetserver.in
@@ -55,7 +55,7 @@
 command="/usr/sbin/daemon"
 java_cmd="${puppetserver_java_home}/bin/java"
 procname="${java_cmd}"
-command_args="-p ${pidfile} ${java_cmd} -cp %%DATADIR%%/puppet-server-release.jar:%%DATADIR%%/jruby-9k.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}"
+command_args="-f -p ${pidfile} ${java_cmd} -cp %%DATADIR%%/puppet-server-release.jar:%%DATADIR%%/jruby-9k.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}"
 
 
 required_files="${java_cmd}"
Index: head/sysutils/puppetserver6/Makefile
===================================================================
--- head/sysutils/puppetserver6/Makefile
+++ head/sysutils/puppetserver6/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	puppetserver
 PORTVERSION=	6.2.1
+PORTREVISION=	1
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppet/
 PKGNAMESUFFIX=	6
Index: head/sysutils/puppetserver6/files/puppetserver.in
===================================================================
--- head/sysutils/puppetserver6/files/puppetserver.in
+++ head/sysutils/puppetserver6/files/puppetserver.in
@@ -55,7 +55,7 @@
 command="/usr/sbin/daemon"
 java_cmd="${puppetserver_java_home}/bin/java"
 procname="${java_cmd}"
-command_args="-p ${pidfile} ${java_cmd} -cp %%DATADIR%%/puppet-server-release.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}"
+command_args="-f -p ${pidfile} ${java_cmd} -cp %%DATADIR%%/puppet-server-release.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}"
 
 
 required_files="${java_cmd}"