diff --git a/www/puppetboard/Makefile b/www/puppetboard/Makefile
index dee8f92f613..af27d1f3425 100644
--- a/www/puppetboard/Makefile
+++ b/www/puppetboard/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2015/07/15 22:24:51 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.11 2015/08/01 06:13:25 ajacoutot Exp $
 
 COMMENT=		web interface to PuppetDB
 
 MODPY_EGG_VERSION=	0.0.4
 DISTNAME=		puppetboard-${MODPY_EGG_VERSION}
-REVISION=		2
+REVISION=		3
 CATEGORIES=		www
 
 MAINTAINER=		Jasper Lievisse Adriaanse <jasper@openbsd.org>
diff --git a/www/puppetboard/pkg/puppetboard.rc b/www/puppetboard/pkg/puppetboard.rc
index 8cf4d3e9840..cdb3b4b4d32 100644
--- a/www/puppetboard/pkg/puppetboard.rc
+++ b/www/puppetboard/pkg/puppetboard.rc
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: puppetboard.rc,v 1.4 2015/07/15 22:24:51 ajacoutot Exp $
+# $OpenBSD: puppetboard.rc,v 1.5 2015/08/01 06:13:25 ajacoutot Exp $
 
 daemon="puppetboard_wsgi"
 daemon_flags="--workers 4"
@@ -8,7 +8,7 @@ daemon_user="_puppetboard"
 
 . /etc/rc.d/rc.subr
 
-pexp="${MODPY_BIN} .*${daemon}:application .*"
+pexp="${MODPY_BIN}.*${daemon_flags:+ ${daemon_flags}} ${daemon}:application"
 
 rc_start() {
 	${rcexec} "cd ${INSTDIR} && \