diff --git a/etc/Makefile b/etc/Makefile
index d763df6d44e9..09c28141d833 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -224,6 +224,7 @@ distribution:
 	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
 	${_+_}cd ${.CURDIR}/devd; ${MAKE} install
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
+	${_+_}cd ${.CURDIR}/keys; ${MAKE} install
 	${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
 .if ${MK_PKGBOOTSTRAP} != "no"
 	${_+_}cd ${.CURDIR}/pkg; ${MAKE} install
diff --git a/etc/keys/Makefile b/etc/keys/Makefile
new file mode 100644
index 000000000000..d685b064ccd3
--- /dev/null
+++ b/etc/keys/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR= pkg
+
+.include <bsd.subdir.mk>
diff --git a/etc/keys/pkg/Makefile b/etc/keys/pkg/Makefile
new file mode 100644
index 000000000000..1d83caf9bfe8
--- /dev/null
+++ b/etc/keys/pkg/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR=	trusted
+
+.include <bsd.subdir.mk>
diff --git a/etc/keys/pkg/trusted/Makefile b/etc/keys/pkg/trusted/Makefile
new file mode 100644
index 000000000000..fba8de73597b
--- /dev/null
+++ b/etc/keys/pkg/trusted/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+NO_OBJ=
+
+FILES=	pkg.freebsd.org.2013102301
+
+FILESDIR=	/etc/keys/pkg/trusted
+FILESMODE=	644
+
+.include <bsd.prog.mk>
diff --git a/etc/keys/pkg/trusted/pkg.freebsd.org.2013102301 b/etc/keys/pkg/trusted/pkg.freebsd.org.2013102301
new file mode 100644
index 000000000000..587f5dd87b34
--- /dev/null
+++ b/etc/keys/pkg/trusted/pkg.freebsd.org.2013102301
@@ -0,0 +1,5 @@
+# $FreeBSD$
+# This key is for testing purposes only and will be revoked before 10.0-RELEASE
+
+function: "sha256"
+fingerprint: "b0170035af3acc5f3f3ae1859dc717101b4e6c1d0a794ad554928ca0cbb2f438"
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index a6cba2474491..f182817ed8fd 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -34,6 +34,14 @@
         ..
         gss
         ..
+        keys
+	    pkg
+                revoked
+                ..
+                trusted
+                ..
+	    ..
+	..
         mail
         ..
         mtree
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 2eae5c7cc038..def0209915d3 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -32,7 +32,7 @@
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd October 19, 2013
+.Dd October 23, 2013
 .Dt HIER 7
 .Os
 .Sh NAME
@@ -94,6 +94,15 @@ bluetooth configuration files
 gnats configuration files;
 see
 .Xr send-pr 1
+.It Pa keys/
+known trusted and revoked keys.
+.Pp
+.Bl -tag -width ".Pa keys/pkg/" -compact
+.It Pa keys/pkg/
+fingerprints for
+.Xr pkg 8
+.El
+.Pp
 .It Pa localtime
 local timezone information;
 see