diff --git a/devel/ruby-rspec/serverspec/Makefile b/devel/ruby-rspec/serverspec/Makefile
index 456c2934f38..4e551c7202a 100644
--- a/devel/ruby-rspec/serverspec/Makefile
+++ b/devel/ruby-rspec/serverspec/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.31 2016/04/26 10:53:40 jasper Exp $
+# $OpenBSD: Makefile,v 1.32 2016/05/25 06:55:53 jasper Exp $
 
 PORTROACH=	limitw:1,even
 
 COMMENT=	RSpec tests for testing machine configuration/state
 
-DISTNAME=	serverspec-2.32.0
+DISTNAME=	serverspec-2.36.0
 
 HOMEPAGE=	http://serverspec.org/
 
diff --git a/devel/ruby-rspec/serverspec/distinfo b/devel/ruby-rspec/serverspec/distinfo
index 188fbb5c4a8..786f6d99f52 100644
--- a/devel/ruby-rspec/serverspec/distinfo
+++ b/devel/ruby-rspec/serverspec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (serverspec-2.32.0.gem) = 8EgKKLGcmBbwkFtHFc9ZWbY5Bm8L9XVaF43/8UBimjc=
-SIZE (serverspec-2.32.0.gem) = 37888
+SHA256 (serverspec-2.36.0.gem) = fcBNZGrUJjeFDK56MrG8N6XJkxkLqz8MTluacYe7gv0=
+SIZE (serverspec-2.36.0.gem) = 38912
diff --git a/devel/ruby-rspec/serverspec/pkg/PLIST b/devel/ruby-rspec/serverspec/pkg/PLIST
index be673bb4e9a..19feda4285e 100644
--- a/devel/ruby-rspec/serverspec/pkg/PLIST
+++ b/devel/ruby-rspec/serverspec/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.16 2016/04/26 10:53:40 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.17 2016/05/25 06:55:53 jasper Exp $
 ${GEM_BIN}/serverspec-init${GEM_BIN_SUFFIX}
 ${GEM_LIB}/cache/${DISTNAME}.gem
 ${GEM_LIB}/gems/${DISTNAME}/
@@ -71,6 +71,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/serverspec/type/ip6tables.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/serverspec/type/ipfilter.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/serverspec/type/ipnat.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/serverspec/type/iptables.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/serverspec/type/json_file.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/serverspec/type/kernel_module.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/serverspec/type/linux_audit_system.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/serverspec/type/linux_kernel_parameter.rb
@@ -121,6 +122,7 @@ ${GEM_LIB}/gems/${DISTNAME}/spec/type/base/default_gateway_spec.rb
 ${GEM_LIB}/gems/${DISTNAME}/spec/type/base/file_spec.rb
 ${GEM_LIB}/gems/${DISTNAME}/spec/type/base/group_spec.rb
 ${GEM_LIB}/gems/${DISTNAME}/spec/type/base/host_spec.rb
+${GEM_LIB}/gems/${DISTNAME}/spec/type/base/json_file_spec.rb
 ${GEM_LIB}/gems/${DISTNAME}/spec/type/base/mail_alias_spec.rb
 ${GEM_LIB}/gems/${DISTNAME}/spec/type/base/mysql_config_spec.rb
 ${GEM_LIB}/gems/${DISTNAME}/spec/type/base/package_spec.rb