diff --git a/sysutils/puppetserver6/Makefile b/sysutils/puppetserver6/Makefile
index 06b418064272..d171139bd445 100644
--- a/sysutils/puppetserver6/Makefile
+++ b/sysutils/puppetserver6/Makefile
@@ -15,7 +15,8 @@ RUN_DEPENDS=	bash>=0:shells/bash \
 		jruby>=9.1:lang/jruby \
 		puppet6>=0:sysutils/puppet6 \
 		rubygem-puppetserver-ca>=1:sysutils/rubygem-puppetserver-ca \
-		rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet
+		rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet \
+		sudo>=1:security/sudo
 
 USES=		shebangfix
 USE_RC_SUBR=	puppetserver
@@ -42,7 +43,7 @@ post-patch:
 	ext/config/conf.d/web-routes.conf ext/config/conf.d/webserver.conf \
 	ext/config/conf.d/auth.conf ext/config/services.d/ca.cfg \
 	ext/system-config/services.d/bootstrap.cfg ext/bin/puppetserver \
-	ext/cli_defaults/cli-defaults.sh
+	ext/cli_defaults/cli-defaults.sh ext/cli/foreground
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
 		-e 's|%%RUBY_SITELIBDIR%%|${RUBY_SITELIBDIR}|' \
 		-e 's|%%RUBY_VER%%|${RUBY_VER}|' \
@@ -61,6 +62,8 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppet/code
 	@${MKDIR} ${STAGEDIR}/var/log/puppetserver
 	@${MKDIR} ${STAGEDIR}/var/puppet/server
+	@${MKDIR} ${STAGEDIR}/var/puppet/server/data
+	@${MKDIR} ${STAGEDIR}/var/run/puppetserver
 	${INSTALL_DATA} ${WRKSRC}/puppet-server-release.jar ${STAGEDIR}${DATADIR}/puppet-server-release.jar
 	${INSTALL_DATA} ${WRKSRC}/ext/config/conf.d/global.conf ${STAGEDIR}${ETCDIR}/conf.d/global.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/ext/config/logback.xml ${STAGEDIR}${ETCDIR}/logback.xml.sample
diff --git a/sysutils/puppetserver6/files/patch-ext__cli__foreground b/sysutils/puppetserver6/files/patch-ext__cli__foreground
new file mode 100644
index 000000000000..36a5a1144552
--- /dev/null
+++ b/sysutils/puppetserver6/files/patch-ext__cli__foreground
@@ -0,0 +1,19 @@
+--- ext/cli/foreground.orig	2019-02-08 20:38:48.978660000 -0800
++++ ext/cli/foreground	2019-02-08 21:31:43.683308000 -0800
+@@ -1,6 +1,6 @@
+ #!/usr/bin/env bash
+ 
+-restartfile="/opt/puppetlabs/server/data/puppetserver/restartcounter"
++restartfile="/var/puppet/server/data/puppetserver/restartcounter"
+ cli_defaults=${INSTALL_DIR}/cli/cli-defaults.sh
+ 
+ if [ ! -e "${INSTALL_DIR}/ezbake-functions.sh" ]; then
+@@ -31,7 +31,7 @@
+          -Djava.security.egd=/dev/urandom \
+          -cp "$CLASSPATH" \
+          clojure.main -m puppetlabs.trapperkeeper.main \
+-         --config ${CONFIG} --bootstrap-config ${BOOTSTRAP_CONFIG} \
++         --config ${CONFIG} --bootstrap-config %%ETCDIR%%/services.d \
+          --restart-file "${restartfile}" \
+          ${TK_ARGS} \
+          ${@}"
diff --git a/sysutils/puppetserver6/files/patch-ext__ezbake-functions.sh b/sysutils/puppetserver6/files/patch-ext__ezbake-functions.sh
new file mode 100644
index 000000000000..022d52fe86fb
--- /dev/null
+++ b/sysutils/puppetserver6/files/patch-ext__ezbake-functions.sh
@@ -0,0 +1,11 @@
+--- ext/ezbake-functions.sh.orig	2019-02-08 21:16:18.212575000 -0800
++++ ext/ezbake-functions.sh	2019-02-08 21:16:49.208798000 -0800
+@@ -126,7 +126,7 @@
+     local group="${GROUP:-puppet}"
+ 
+     if [ ! -e "$restartfile" ]; then
+-        /usr/bin/install --directory --owner=$user --group=$group --mode=755 "$restart_file_base_dir"
++        /usr/bin/install -d -o $user -g $group -m 755 "$restart_file_base_dir"
+         if [ $? -ne 0 ]; then
+             echo "Unable to create or set permissions for restart file at ${restart_file_base_dir}" 1>&2
+             return 1
diff --git a/sysutils/puppetserver6/pkg-plist b/sysutils/puppetserver6/pkg-plist
index 63ee32771981..6e7c90aeb097 100644
--- a/sysutils/puppetserver6/pkg-plist
+++ b/sysutils/puppetserver6/pkg-plist
@@ -24,3 +24,5 @@
 @dir(puppet,puppet,750) /var/log/puppetserver
 @dir(puppet,puppet,755) /var/puppet
 @dir(puppet,puppet,750) /var/puppet/server
+@dir(puppet,puppet,750) /var/puppet/server/data
+@dir(puppet,puppet,750) /var/run/puppetserver