diff --git a/sysutils/puppetserver5/Makefile b/sysutils/puppetserver5/Makefile
index b80c2abdbe33..eb89812eb3b8 100644
--- a/sysutils/puppetserver5/Makefile
+++ b/sysutils/puppetserver5/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	puppetserver
 PORTVERSION=	5.3.14
+PORTREVISION=	1
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppet/
 PKGNAMESUFFIX=	5
@@ -36,17 +37,6 @@ GROUPS=		puppet
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFAULT=	CFACTER
-OPTIONS_RADIO=		FACTER
-OPTIONS_RADIO_FACTER=	CFACTER RFACTER
-
-RFACTER_DESC=	Use facter 2.x (written in Ruby)
-CFACTER_DESC=	Use facter 3.x (experimental rewrite in C++)
-
-RFACTER_RUN_DEPENDS=	rubygem-facter>=2.0:sysutils/rubygem-facter
-
-CFACTER_RUN_DEPENDS=	facter>=3.0:sysutils/facter
-
 post-patch:
 .for file in ext/config/logback.xml ext/config/request-logging.xml \
 	ext/config/conf.d/global.conf ext/config/conf.d/puppetserver.conf \
diff --git a/sysutils/puppetserver5/distinfo b/sysutils/puppetserver5/distinfo
index 427d0d723ed1..12076925e226 100644
--- a/sysutils/puppetserver5/distinfo
+++ b/sysutils/puppetserver5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1594846825
+TIMESTAMP = 1598656625
 SHA256 (puppetserver-5.3.14.tar.gz) = 23cebf6fda2233abcf059020bb73c9a9a283a89cfc211e3582cea59813da142c
 SIZE (puppetserver-5.3.14.tar.gz) = 53787806
diff --git a/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf b/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf
index 07d8813ae735..a1f1fc0ce540 100644
--- a/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf
+++ b/sysutils/puppetserver5/files/patch-ext__config__conf.d__puppetserver.conf
@@ -1,6 +1,6 @@
---- ext/config/conf.d/puppetserver.conf.orig	2018-08-21 16:07:02 UTC
+--- ext/config/conf.d/puppetserver.conf.orig	2020-07-02 18:59:15 UTC
 +++ ext/config/conf.d/puppetserver.conf
-@@ -2,16 +2,20 @@
+@@ -2,16 +2,21 @@
  jruby-puppet: {
      # Where the puppet-agent dependency places puppet, facter, etc...
      # Puppet server expects to load Puppet from this location
@@ -8,7 +8,8 @@
 +    ruby-load-path: [
 +        %%RUBY_SITELIBDIR%%,
 +        %%PREFIX%%/lib/ruby/vendor_ruby,
-+        %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/facter-2.5.0/lib,
++        %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/facter/lib,
++        %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/hocon-1.3.1/lib,
 +    ]
  
      # This setting determines where JRuby will install gems.  It is used for loading gems,
@@ -24,7 +25,7 @@
  
      # PLEASE NOTE: Use caution when modifying the below settings. Modifying
      # these settings will change the value of the corresponding Puppet settings
-@@ -26,23 +30,23 @@ jruby-puppet: {
+@@ -26,23 +31,23 @@ jruby-puppet: {
  
      # (optional) path to puppet conf dir; if not specified, will use
      # /etc/puppetlabs/puppet