diff --git a/sysutils/puppetserver/Makefile b/sysutils/puppetserver/Makefile
index 239a7e38bd92..14977721298e 100644
--- a/sysutils/puppetserver/Makefile
+++ b/sysutils/puppetserver/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	puppetserver
-PORTVERSION=	2.7.2
-PORTREVISION=	1
+PORTVERSION=	2.8.0
+PORTREVISION=	0
 CATEGORIES=	sysutils java
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 
diff --git a/sysutils/puppetserver/distinfo b/sysutils/puppetserver/distinfo
index 8f44b12ef698..e98dc7121a29 100644
--- a/sysutils/puppetserver/distinfo
+++ b/sysutils/puppetserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485891106
-SHA256 (puppetserver-2.7.2.tar.gz) = 49341bbc0d6ec95b1790f92f1ca32f199f5ce1de442f35fd28f7d9cb04ce9fc3
-SIZE (puppetserver-2.7.2.tar.gz) = 33990767
+TIMESTAMP = 1504668940
+SHA256 (puppetserver-2.8.0.tar.gz) = 0f6f49b149639b80c3caecaeced44c7c0cb98728da7ce12f6725b061f3152812
+SIZE (puppetserver-2.8.0.tar.gz) = 34015599
diff --git a/sysutils/puppetserver/files/patch-ext__config__conf.d__puppetserver.conf b/sysutils/puppetserver/files/patch-ext__config__conf.d__puppetserver.conf
index 1dd254da65db..358f6d87154b 100644
--- a/sysutils/puppetserver/files/patch-ext__config__conf.d__puppetserver.conf
+++ b/sysutils/puppetserver/files/patch-ext__config__conf.d__puppetserver.conf
@@ -6,7 +6,7 @@
      ruby-load-path: [/opt/puppetlabs/puppet/lib/ruby/vendor_ruby]
 +    ruby-load-path: [
 +        %%RUBY_SITELIBDIR%%,
-+        %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/facter-2.4.6/lib,
++        %%PREFIX%%/lib/ruby/gems/%%RUBY_VER%%/gems/facter/lib,
 +    ]
  
      # This setting determines where JRuby will install gems.  It is used for loading gems,