diff --git a/sysutils/cfengine318/Makefile b/sysutils/cfengine318/Makefile
index f4b2a8713a10..72cb2d0f5954 100644
--- a/sysutils/cfengine318/Makefile
+++ b/sysutils/cfengine318/Makefile
@@ -1,70 +1,71 @@
 # Created by: jrhett@netconsonance.com
 
 PORTNAME=	cfengine
 PORTVERSION=	3.18.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://s3.amazonaws.com/cfengine-package-repos/tarballs/
 
 MAINTAINER=	cy@FreeBSD.org
 #		gjb@FreeBSD.org is also committer for this port
 #		skreuzer@FreeBSD.org is also committer for this port
 COMMENT=	Systems administration tool for networks
 
 LICENSE=	GPLv3
 
 CPE_VENDOR=	gnu
 
 CONFLICTS=	cfengine3[0-9]-* cfengine31[0-79]-*
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	318
 CONFLICTS+=	cfengine-3.*
 .endif
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
 USE_RC_SUBR=	cf-execd cf-serverd cf-monitord
 
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USES=		autoreconf cpe gmake gnome libtool localbase shebangfix ssl
 USE_GNOME=	libxml2
 SHEBANG_FILES=	examples/remake_outputs.pl
 CFLAGS+=	-Wno-return-type -fcommon
 # EXAMPLESDIR=	${PREFIX}/share/examples/cfengine3
 DOCSDIR=	${PREFIX}/share/doc/cfengine
 MAKE_ENV=	EXPLICIT_VERSION=${PORTVERSION}
 CONFIGURE_ENV=	EXPLICIT_VERSION=${PORTVERSION}
 CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 		--htmldir=${DOCSDIR}/html \
 		--libexecdir=${PREFIX}/libexec \
 		--libdir=${PREFIX}/libexec \
 		--mandir=${PREFIX}/man \
 		--with-workdir=/var/cfengine \
 		--with-pcre=${LOCALBASE} \
 		--with-lmdb=${LOCALBASE} \
 		--enable-fhs
 INSTALL_TARGET=	install-strip
 
 LIB_DEPENDS+=	libpcre.so:devel/pcre \
 		liblmdb.so:databases/lmdb \
 		libyaml.so:textproc/libyaml \
 		libcurl.so:ftp/curl
 
 OPTIONS_DEFINE=	PGSQL MYSQL LIBVIRT
 
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	--with-postgresql=${LOCALBASE}
 PGSQL_CONFIGURE_OFF=	--without-postgresql
 
 MYSQL_USES=		mysql
 MYSQL_BROKEN=		configure: error: MySQL client library exports symbols (EVP_CIPHER_CTX_init) clashing with OpenSSL.
 MYSQL_CONFIGURE_WITH=	--with-mysql=${LOCALBASE}
 MYSQL_CONFIGURE_OFF=	--without-mysql
 MYSQL_LIB_DEPENDS=	libmysqlclient.so:${_MYSQL_CLIENT}
 MYSQL_LDFLAGS=		-L${LOCALBASE}/lib/mysql
 
 LIBVIRT_CONFIGURE_WITH=	--with-libvirt=${LOCALBASE}
 LIBVIRT_LIB_DEPENDS+=	libvirt.so:devel/libvirt
 
 .include <bsd.port.mk>
diff --git a/sysutils/cfengine318/files/cf-execd.in b/sysutils/cfengine318/files/cf-execd.in
index ace1288a92ef..b40d3507649a 100644
--- a/sysutils/cfengine318/files/cf-execd.in
+++ b/sysutils/cfengine318/files/cf-execd.in
@@ -1,26 +1,26 @@
 #!/bin/sh
 
 # PROVIDE: cf-execd
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf[.local] to enable cf-execd(8)
 #
 # cf_execd_enable (bool):        Set to "NO" by default.
 #                               Set it to "YES" to enable cf-execd.
 # cf_execd_flags (str):          Custom additional arguments to be passed
 #                               to cf-execd (default empty).
 #
 
 . /etc/rc.subr
 
 name="cf_execd"
 rcvar=cf_execd_enable
 
-command="%%PREFIX%%/sbin/cf-execd"
+command="%%PREFIX%%/bin/cf-execd"
 
 load_rc_config $name
 
 : ${cf_execd_enable="NO"}
 
 run_rc_command "$1"
diff --git a/sysutils/cfengine318/files/cf-monitord.in b/sysutils/cfengine318/files/cf-monitord.in
index efa6aaa6e495..dd21a0aaed6d 100644
--- a/sysutils/cfengine318/files/cf-monitord.in
+++ b/sysutils/cfengine318/files/cf-monitord.in
@@ -1,26 +1,26 @@
 #!/bin/sh
 
 # PROVIDE: cf-monitord
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf[.local] to enable cf-monitord(8)
 #
 # cf_monitord_enable (bool):        Set to "NO" by default.
 #                               Set it to "YES" to enable cf-monitord.
 # cf_monitord_flags (str):          Custom additional arguments to be passed
 #                               to cf-monitord (default empty).
 #
 
 . /etc/rc.subr
 
 name="cf_monitord"
 rcvar=cf_monitord_enable
 
-command="%%PREFIX%%/sbin/cf-monitord"
+command="%%PREFIX%%/bin/cf-monitord"
 
 load_rc_config $name
 
 : ${cf_monitord_enable="NO"}
 
 run_rc_command "$1"
diff --git a/sysutils/cfengine318/files/cf-serverd.in b/sysutils/cfengine318/files/cf-serverd.in
index a53b091ffbf9..938274887353 100644
--- a/sysutils/cfengine318/files/cf-serverd.in
+++ b/sysutils/cfengine318/files/cf-serverd.in
@@ -1,26 +1,26 @@
 #!/bin/sh
 
 # PROVIDE: cf-serverd
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf[.local] to enable cf-serverd(8)
 #
 # cf_serverd_enable (bool):        Set to "NO" by default.
 #                               Set it to "YES" to enable cf-serverd.
 # cf_serverd_flags (str):          Custom additional arguments to be passed
 #                               to cf-serverd (default empty).
 #
 
 . /etc/rc.subr
 
 name="cf_serverd"
 rcvar=cf_serverd_enable
 
-command="%%PREFIX%%/sbin/cf-serverd"
+command="%%PREFIX%%/bin/cf-serverd"
 
 load_rc_config $name
 
 : ${cf_serverd_enable="NO"}
 
 run_rc_command "$1"