diff --git a/sysutils/cfengine-masterfiles39/Makefile b/sysutils/cfengine-masterfiles39/Makefile
index 2f48a0524cc4..067d4074e2f5 100644
--- a/sysutils/cfengine-masterfiles39/Makefile
+++ b/sysutils/cfengine-masterfiles39/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cfengine-masterfiles
-PORTVERSION=	3.9.1
+PORTVERSION=	3.9.2
 CATEGORIES=	sysutils
 MASTER_SITES=	https://cfengine-package-repos.s3.amazonaws.com/tarballs/
 
diff --git a/sysutils/cfengine-masterfiles39/distinfo b/sysutils/cfengine-masterfiles39/distinfo
index f39fad84f7e0..1b634188e645 100644
--- a/sysutils/cfengine-masterfiles39/distinfo
+++ b/sysutils/cfengine-masterfiles39/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470432585
-SHA256 (cfengine-masterfiles-3.9.1.tar.gz) = 99d59ea4229253ef2e35fc30c33d5e2605fab1144af7b16562affcceabddb03a
-SIZE (cfengine-masterfiles-3.9.1.tar.gz) = 426996
+TIMESTAMP = 1521576332
+SHA256 (cfengine-masterfiles-3.9.2.tar.gz) = bc5b89acc5fb8b33720afd95cdcc3b2fe5c1be8d022a47563cbd106d8e8e106d
+SIZE (cfengine-masterfiles-3.9.2.tar.gz) = 438464
diff --git a/sysutils/cfengine-masterfiles39/files/patch-Makefile.in b/sysutils/cfengine-masterfiles39/files/patch-Makefile.in
new file mode 100644
index 000000000000..31fa5d2367eb
--- /dev/null
+++ b/sysutils/cfengine-masterfiles39/files/patch-Makefile.in
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	2016-12-19 08:57:54.000000000 -0800
++++ Makefile.in	2018-03-20 17:15:50.991081000 -0700
+@@ -325,7 +325,7 @@
+ EXTRA_DIST = README.md inventory/README.md lib/README.md lib/3.7/README.md CONTRIBUTING.md LICENSE
+ 
+ # Do not reveal usernames of the buildslave
+-TAR_OPTIONS = --owner=0 --group=0
++export TAR_OPTIONS = --owner=0 --group=0
+ all: all-recursive
+ 
+ .SUFFIXES:
+@@ -816,8 +816,6 @@
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ 	pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+ 	uninstall-nobase_dist_masterfilesDATA
+-
+-export TAR_OPTIONS
+ 
+ # Store the permissions properly in the tarball for acceptance tests to succeed
+ dist-hook:
diff --git a/sysutils/cfengine39/Makefile b/sysutils/cfengine39/Makefile
index 531c56568db1..29381c51baec 100644
--- a/sysutils/cfengine39/Makefile
+++ b/sysutils/cfengine39/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cfengine
-PORTVERSION=	3.9.1
-PORTREVISION=	5
+PORTVERSION=	3.9.2
 CATEGORIES=	sysutils
 MASTER_SITES=	https://s3.amazonaws.com/cfengine-package-repos/tarballs/
 
@@ -31,7 +30,7 @@ USE_RC_SUBR=	cf-execd cf-serverd cf-monitord
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USES=		autoreconf:build \
+USES=		autoreconf \
 		cpe gmake libtool localbase shebangfix ssl
 USE_GNOME=	libxml2
 SHEBANG_FILES=	examples/remake_outputs.pl
diff --git a/sysutils/cfengine39/distinfo b/sysutils/cfengine39/distinfo
index 68b7c90c6810..899026f0699c 100644
--- a/sysutils/cfengine39/distinfo
+++ b/sysutils/cfengine39/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470238660
-SHA256 (cfengine-3.9.1.tar.gz) = 19bf900741efe3da4266591985dc1103243cb751888047694fce6f407ef2d225
-SIZE (cfengine-3.9.1.tar.gz) = 2278474
+TIMESTAMP = 1521573007
+SHA256 (cfengine-3.9.2.tar.gz) = cc1eb78477f6672170c1675d93b03dda0eb92165b872b18e02ea46e4e6fe9fc6
+SIZE (cfengine-3.9.2.tar.gz) = 2303985
diff --git a/sysutils/cfengine39/files/patch-configure.ac b/sysutils/cfengine39/files/patch-configure.ac
deleted file mode 100644
index 2f61965e4262..000000000000
--- a/sysutils/cfengine39/files/patch-configure.ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2016-07-28 21:25:32 UTC
-+++ configure.ac
-@@ -1438,7 +1438,7 @@ dnl ####################################
- AC_MSG_CHECKING(for Xen cpuid-based HVM detection)
- if test x"$GCC" = "xyes"; then
-     case $host_cpu in
--        i[[3456]]86*|x86_64*)
-+        i[[3456]]86*|x86_64*|amd64)
-             AC_DEFINE(XEN_CPUID_SUPPORT, 1, [Define if XEN cpuid-based HVM detection is available.])
-             AC_MSG_RESULT(yes)
-             ;;
diff --git a/sysutils/cfengine39/pkg-plist b/sysutils/cfengine39/pkg-plist
index 8efb69ce456f..6522f371514a 100644
--- a/sysutils/cfengine39/pkg-plist
+++ b/sysutils/cfengine39/pkg-plist
@@ -1,4 +1,5 @@
 libexec/cfengine/libpromises.so
+libexec/cfengine/libpromises.so.3
 libexec/cfengine/libpromises.so.3.0.6
 sbin/cf-agent
 sbin/cf-execd