diff --git a/sysutils/facter/Makefile b/sysutils/facter/Makefile
index ed54ade5c62e..71c7c22ef7b4 100644
--- a/sysutils/facter/Makefile
+++ b/sysutils/facter/Makefile
@@ -12,7 +12,6 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_DragonFly=	DragonFly is not supported upstream
-BROKEN_powerpc64=	fails to compile: collection.cc: 'stoi' was not declared in this scope
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
@@ -55,10 +54,4 @@ test: build
 	cd ${WRKSRC}/lib && bundle install --path vendor
 	cd ${CONFIGURE_WRKSRC} && ${MAKE_CMD} test
 
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${COMPILER_FEATURES:Mlibstdc++}
-BROKEN=		Build with system libstdc++ is unsupported
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/facter/files/patch-lib_inc_internal_util_freebsd_geom.hpp b/sysutils/facter/files/patch-lib_inc_internal_util_freebsd_geom.hpp
new file mode 100644
index 000000000000..e20dcb3c6d62
--- /dev/null
+++ b/sysutils/facter/files/patch-lib_inc_internal_util_freebsd_geom.hpp
@@ -0,0 +1,9 @@
+--- lib/inc/internal/util/freebsd/geom.hpp.orig	2019-02-08 14:24:43 UTC
++++ lib/inc/internal/util/freebsd/geom.hpp
+@@ -4,6 +4,7 @@
+  */
+ #pragma once
+ 
++#include <stdexcept>
+ #include <string>
+ #include <vector>