diff --git a/sysutils/rubygem-facter/Makefile b/sysutils/rubygem-facter/Makefile
index 9c145b93568d..4a2633c8d253 100644
--- a/sysutils/rubygem-facter/Makefile
+++ b/sysutils/rubygem-facter/Makefile
@@ -1,31 +1,36 @@
 PORTNAME=	facter
-PORTVERSION=	4.2.10
+PORTVERSION=	4.2.11
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	Cross-platform Ruby library for retrieving facts from OS
 
 LICENSE=	APACHE20
 
+PATCH_SITES=	https://patch-diff.githubusercontent.com/raw/puppetlabs/facter/pull/
+PATCHFILES=	2497.diff 2510.diff
+PATCH_DIST_STRIP=-p1
+
 # rubygem-ffi is a soft dependency, but is used on FreeBSD to resolve some facts
 RUN_DEPENDS=	rubygem-ffi>=1.0:devel/rubygem-ffi \
 		rubygem-hocon>=1.3<2:devel/rubygem-hocon \
 		rubygem-thor>=1.0.1<2.0:devel/rubygem-thor
 
 USES=		cpe gem
 CPE_VENDOR=	puppet
 USE_RUBY=	yes
 
 CONFLICTS_INSTALL=	facter # bin/facter
 
 NO_ARCH=	yes
 
 PLIST_FILES=	bin/facter ${GEMS_DIR}/facter
 
 .include <bsd.port.pre.mk>
 
 post-install:
-	${RLN} ${STAGEDIR}/${PREFIX}/${GEMS_DIR}/facter-${PORTVERSION} ${STAGEDIR}/${PREFIX}/${GEMS_DIR}/facter
+	(cd ${WRKSRC}/lib/facter/facts/freebsd && ${COPYTREE_SHARE} "ec2_metadata.rb ec2_userdata.rb ipaddress_interfaces.rb ipaddress6_interfaces.rb" ${STAGEDIR}/${PREFIX}/${GEMS_DIR}/facter-${PORTVERSION}/lib/facter/facts/freebsd)
+	${RLN} ${STAGEDIR}/${PREFIX}/${GEMS_LIB_DIR} ${STAGEDIR}/${PREFIX}/${GEMS_DIR}/facter
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/rubygem-facter/distinfo b/sysutils/rubygem-facter/distinfo
index a46acfc7fa1a..ed68fc5ade1e 100644
--- a/sysutils/rubygem-facter/distinfo
+++ b/sysutils/rubygem-facter/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1653933373
-SHA256 (rubygem/facter-4.2.10.gem) = 40a6f1b37ede798dc4eda9326d48f599d219bf8bc0d5cf931845e29d52a4bc9b
-SIZE (rubygem/facter-4.2.10.gem) = 158720
+TIMESTAMP = 1659753361
+SHA256 (rubygem/facter-4.2.11.gem) = 10c6a397003ee1afc28753aa033ca896708f04a2b7598e863fd1c7cdeb31d561
+SIZE (rubygem/facter-4.2.11.gem) = 158720
+SHA256 (rubygem/2497.diff) = 757442d435a175d634c41d1a6705f928fa6e620c3d6f86bdf5a031c37c8177b3
+SIZE (rubygem/2497.diff) = 4734
+SHA256 (rubygem/2510.diff) = ee33b32c8162bc20ce0b17a394fe1e57d33101c8db584b0350d3955342b36c2f
+SIZE (rubygem/2510.diff) = 7124