Index: sysutils/puppetserver5/Makefile
===================================================================
--- sysutils/puppetserver5/Makefile
+++ sysutils/puppetserver5/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	puppetserver
 PORTVERSION=	5.3.8
+PORTREVISION=	1
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppet/
 PKGNAMESUFFIX=	5
Index: sysutils/puppetserver5/files/puppetserver.in
===================================================================
--- sysutils/puppetserver5/files/puppetserver.in
+++ sysutils/puppetserver5/files/puppetserver.in
@@ -47,6 +47,7 @@
 : ${puppetserver_enable="NO"}
 : ${puppetserver_args="--config %%PREFIX%%/etc/puppetserver/conf.d -b %%PREFIX%%/etc/puppetserver/services.d"}
 : ${puppetserver_java_home="%%JAVA_HOME%%"}
+: ${puppetserver_java_opts=""}
 : ${puppetserver_user="puppet"}
 : ${puppetserver_group="puppet"}
 : ${puppetserver_log_file="/var/log/puppetserver/puppetserver.log"}
@@ -55,7 +56,7 @@
 command="/usr/sbin/daemon"
 java_cmd="${puppetserver_java_home}/bin/java"
 procname="${java_cmd}"
-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}"
+command_args="-f -p ${pidfile} ${java_cmd} ${puppetserver_java_opts} -cp %%DATADIR%%/puppet-server-release.jar:%%DATADIR%%/jruby-9k.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}"
 
 
 required_files="${java_cmd}"
Index: sysutils/puppetserver6/Makefile
===================================================================
--- sysutils/puppetserver6/Makefile
+++ sysutils/puppetserver6/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	puppetserver
 PORTVERSION=	6.3.0
+PORTREVISION=	1
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppet/
 PKGNAMESUFFIX=	6
Index: sysutils/puppetserver6/files/puppetserver.in
===================================================================
--- sysutils/puppetserver6/files/puppetserver.in
+++ sysutils/puppetserver6/files/puppetserver.in
@@ -47,6 +47,7 @@
 : ${puppetserver_enable="NO"}
 : ${puppetserver_args="--config %%PREFIX%%/etc/puppetserver/conf.d -b %%PREFIX%%/etc/puppetserver/services.d"}
 : ${puppetserver_java_home="%%JAVA_HOME%%"}
+: ${puppetserver_java_opts=""}
 : ${puppetserver_user="puppet"}
 : ${puppetserver_group="puppet"}
 : ${puppetserver_log_file="/var/log/puppetserver/puppetserver.log"}
@@ -55,7 +56,7 @@
 command="/usr/sbin/daemon"
 java_cmd="${puppetserver_java_home}/bin/java"
 procname="${java_cmd}"
-command_args="-f -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} ${puppetserver_java_opts} -cp %%DATADIR%%/puppet-server-release.jar clojure.main -m puppetlabs.trapperkeeper.main ${puppetserver_args}"
 
 
 required_files="${java_cmd}"