diff --git a/www/radicale/Makefile b/www/radicale/Makefile
index 7dbdcaf56772..f4e4564aed7a 100644
--- a/www/radicale/Makefile
+++ b/www/radicale/Makefile
@@ -1,56 +1,57 @@
 # Created by: Mark Felder <feld@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	radicale
 PORTVERSION=	3.0.6
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Radicale-${PORTVERSION}
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	Python based CalDAV/CardDAV server
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}passlib>=0:security/py-passlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vobject>=0.9.6:deskutils/py-vobject@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}waitress>=0:www/py-waitress@${PY_FLAVOR}
 
 USES=		python:3.3+ shebangfix
 USE_PYTHON=	autoplist distutils
 USERS=		radicale
 GROUPS=		radicale
 USE_RC_SUBR=	radicale
 NO_ARCH=	yes
 SHEBANG_FILES=	radicale.wsgi
 
 SUB_LIST=	USERS="${USERS}" GROUPS="${GROUPS}" PYTHON_CMD="${PYTHON_CMD}"
 
 post-patch:
 	@${REINPLACE_CMD} 's,/etc/radicale,${ETCDIR},g' \
 		${WRKSRC}/config \
 		${WRKSRC}/radicale/config.py
 	@${REINPLACE_CMD} 's,/etc/ssl,${ETCDIR},g' \
 		${WRKSRC}/config \
 		${WRKSRC}/radicale/config.py
 	@${REINPLACE_CMD} 's,/var/lib/radicale,${DATADIR},g' \
 		${WRKSRC}/config \
 		${WRKSRC}/radicale/config.py
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/${ETCDIR} ${STAGEDIR}/${DATADIR} ${STAGEDIR}/${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/config ${STAGEDIR}/${ETCDIR}/config.sample
 	${INSTALL_DATA} ${WRKSRC}/rights ${STAGEDIR}/${ETCDIR}/rights.sample
 	${INSTALL_SCRIPT} ${WRKSRC}/radicale.wsgi ${STAGEDIR}${WWWDIR}/radicale.wsgi
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.mk>
diff --git a/www/radicale/files/radicale.in b/www/radicale/files/radicale.in
index 7b4d2802c5dd..b0a7c6949827 100644
--- a/www/radicale/files/radicale.in
+++ b/www/radicale/files/radicale.in
@@ -1,44 +1,44 @@
 #!/bin/sh
 # Created by: Mark Felder <feld@FreeBSD.org>
 # $FreeBSD$
 #
 
 # PROVIDE: radicale
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable radicale:
 #  radicale_enable (bool):    Set to "NO" by default.
 #                       Set it to "YES" to enable radicale.
 #
 
 . /etc/rc.subr
 
 name=radicale
 rcvar=radicale_enable
 
 # set defaults
 
 load_rc_config $name
 
 : ${radicale_enable:=NO}
 : ${radicale_config=%%ETCDIR%%/config}
 : ${radicale_user=%%USERS%%}
 : ${radicale_group=%%GROUPS%%}
 
 pidfile=/var/run/radicale/radicale.pid
 command=/usr/sbin/daemon
-command_args="-P ${pidfile} %%PREFIX%%/bin/radicale -C ${radicale_config}"
+command_args="-P ${pidfile} -f -ST ${name} %%PREFIX%%/bin/radicale -C ${radicale_config}"
 required_files=${radicale_config}
 start_precmd=do_precmd
 
 do_precmd()
 {
 	if [ ! -d ${pidfile%/*} ]; then
 		install -d -o ${radicale_user} ${pidfile%/*}
 	fi
 }
 
 run_rc_command "$1"