diff --git a/databases/Makefile b/databases/Makefile
index 88b37475955..dc2e0cd12a5 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.292 2015/07/14 23:58:59 jasper Exp $
+# $OpenBSD: Makefile,v 1.293 2015/07/16 02:43:48 jasper Exp $
 
      SUBDIR =
      SUBDIR += apache-couchdb
@@ -207,7 +207,7 @@
      SUBDIR += ruby-do_sqlite3,ruby21
      SUBDIR += ruby-do_sqlite3,ruby22
      SUBDIR += ruby-hiera
-     SUBDIR += ruby-hiera2
+     SUBDIR += ruby-hiera3
      SUBDIR += ruby-hiera-eyaml
      SUBDIR += ruby-hiera-file
      SUBDIR += ruby-jdbc-h2
diff --git a/databases/ruby-hiera2/Makefile b/databases/ruby-hiera2/Makefile
deleted file mode 100644
index ea9e277527e..00000000000
--- a/databases/ruby-hiera2/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2015/06/12 17:59:43 jasper Exp $
-
-COMMENT=		simple pluggable hierarchical database
-
-V=			2.0.0
-DISTNAME=		hiera-${V}
-PKGNAME=		hiera2-${V}
-
-CATEGORIES=		databases
-
-HOMEPAGE=		http://projects.puppetlabs.com/projects/hiera
-
-MAINTAINER=		Jasper Lievisse Adriaanse <jasper@openbsd.org>
-
-# Apachev2
-PERMIT_PACKAGE_CDROM=	Yes
-
-MODULES=		lang/ruby
-
-CONFIGURE_STYLE=	ruby gem
-
-BUILD_DEPENDS=		${RUN_DEPENDS}
-RUN_DEPENDS=		devel/ruby-deep_merge,${MODRUBY_FLAVOR} \
-			devel/ruby-json_pure,${MODRUBY_FLAVOR}
-
-TEST_DEPENDS=		devel/ruby-mocha,${MODRUBY_FLAVOR}
-MODRUBY_TEST=		rspec3
-
-pre-configure:
-	perl -pi -e 's,/var/lib,/var/db,g' \
-		${WRKSRC}/lib/hiera/backend.rb \
-		${WRKSRC}/lib/hiera/util.rb \
-		${WRKSRC}/spec/unit/util_spec.rb \
-		${WRKSRC}/README.md
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${MODRUBY_RELEXAMPLEDIR}-hiera
-	${INSTALL_DATA} ${FILESDIR}/hiera.yaml \
-		${PREFIX}/${MODRUBY_RELEXAMPLEDIR}-hiera
-
-.include <bsd.port.mk>
diff --git a/databases/ruby-hiera2/distinfo b/databases/ruby-hiera2/distinfo
deleted file mode 100644
index 1395fd947ca..00000000000
--- a/databases/ruby-hiera2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (hiera-2.0.0.gem) = FkXehkt9Wa8kgvEbhKq+AVEhsqmUfRgWYj6g3Sxzhfg=
-SIZE (hiera-2.0.0.gem) = 35840
diff --git a/databases/ruby-hiera2/files/hiera.yaml b/databases/ruby-hiera2/files/hiera.yaml
deleted file mode 100644
index 3f428fe5956..00000000000
--- a/databases/ruby-hiera2/files/hiera.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-# $OpenBSD: hiera.yaml,v 1.1.1.1 2015/06/12 17:59:43 jasper Exp $
-
----
-:backends:
-  - yaml
-:hierarchy:
-  - defaults
-  - '%{clientcert}'
-  - '%{environment}'
-  - global
-
-:yaml:
-# datadir is empty here, so hiera uses its defaults:
-# - /etc/puppetlabs/code/hieradata/ on *nix
-# - %CommonAppData%\PuppetLabs\code\hieradata on Windows
-# When specifying a datadir, make sure the directory exists.
-  :datadir:
diff --git a/databases/ruby-hiera2/patches/patch-spec_unit_util_spec_rb b/databases/ruby-hiera2/patches/patch-spec_unit_util_spec_rb
deleted file mode 100644
index 2473082e119..00000000000
--- a/databases/ruby-hiera2/patches/patch-spec_unit_util_spec_rb
+++ /dev/null
@@ -1,29 +0,0 @@
-$OpenBSD: patch-spec_unit_util_spec_rb,v 1.1.1.1 2015/06/12 17:59:43 jasper Exp $
-
-Make this work with rspec3.
-
---- spec/unit/util_spec.rb.orig	Fri Oct 17 19:57:43 2014
-+++ spec/unit/util_spec.rb	Fri Oct 17 19:58:40 2014
-@@ -4,19 +4,19 @@ describe Hiera::Util do
-   describe 'Hiera::Util.posix?' do
-     it 'should return true on posix systems' do
-       Etc.expects(:getpwuid).with(0).returns(true)
--      Hiera::Util.posix?.should be_true
-+      Hiera::Util.posix?.should be true
-     end
- 
-     it 'should return false on non posix systems' do
-       Etc.expects(:getpwuid).with(0).returns(nil)
--      Hiera::Util.posix?.should be_false
-+      Hiera::Util.posix?.should be_falsy
-     end
-   end
- 
-   describe 'Hiera::Util.microsoft_windows?' do
-     it 'should return false on posix systems' do
-       Hiera::Util.expects(:file_alt_separator).returns(nil)
--      Hiera::Util.microsoft_windows?.should be_false
-+      Hiera::Util.microsoft_windows?.should be_falsy
-     end
-   end
- 
diff --git a/databases/ruby-hiera2/pkg/DESCR b/databases/ruby-hiera2/pkg/DESCR
deleted file mode 100644
index 344b62934cc..00000000000
--- a/databases/ruby-hiera2/pkg/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Hiera is a pluggable (YAML, JSON, Puppet) hierarchical database for
-storing infrastructure representation data.
diff --git a/databases/ruby-hiera2/pkg/PLIST b/databases/ruby-hiera2/pkg/PLIST
deleted file mode 100644
index dbb1d0c8e01..00000000000
--- a/databases/ruby-hiera2/pkg/PLIST
+++ /dev/null
@@ -1,49 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2015/06/12 17:59:43 jasper Exp $
-@conflict ruby21-hiera-<2.0.0
-${GEM_BIN}/hiera${GEM_BIN_SUFFIX}
-${GEM_LIB}/cache/${DISTNAME}.gem
-${GEM_LIB}/gems/${DISTNAME}/
-${GEM_LIB}/gems/${DISTNAME}/COPYING
-${GEM_LIB}/gems/${DISTNAME}/LICENSE
-${GEM_LIB}/gems/${DISTNAME}/README.md
-${GEM_LIB}/gems/${DISTNAME}/bin/
-${GEM_LIB}/gems/${DISTNAME}/bin/hiera
-${GEM_LIB}/gems/${DISTNAME}/lib/
-${GEM_LIB}/gems/${DISTNAME}/lib/hiera/
-${GEM_LIB}/gems/${DISTNAME}/lib/hiera.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/hiera/backend/
-${GEM_LIB}/gems/${DISTNAME}/lib/hiera/backend.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/hiera/backend/json_backend.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/hiera/backend/yaml_backend.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/hiera/config.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/hiera/console_logger.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/hiera/error.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/hiera/fallback_logger.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/hiera/filecache.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/hiera/interpolate.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/hiera/noop_logger.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/hiera/puppet_logger.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/hiera/recursive_guard.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/hiera/util.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/hiera/version.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/
-${GEM_LIB}/gems/${DISTNAME}/spec/spec_helper.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/unit/
-${GEM_LIB}/gems/${DISTNAME}/spec/unit/backend/
-${GEM_LIB}/gems/${DISTNAME}/spec/unit/backend/json_backend_spec.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/unit/backend/yaml_backend_spec.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/unit/backend_spec.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/unit/config_spec.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/unit/console_logger_spec.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/unit/fallback_logger_spec.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/unit/filecache_spec.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/unit/hiera_spec.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/unit/puppet_logger_spec.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/unit/util_spec.rb
-${GEM_LIB}/gems/${DISTNAME}/spec/unit/version_spec.rb
-${GEM_LIB}/specifications/${DISTNAME}.gemspec
-${MODRUBY_RELEXAMPLEDIR}-hiera/
-@sample ${SYSCONFDIR}/puppetlabs/code/
-${MODRUBY_RELEXAMPLEDIR}-hiera/hiera.yaml
-@sample ${SYSCONFDIR}/puppetlabs/code/hiera.yaml
-@sample ${SYSCONFDIR}/puppetlabs/code/hieradata/