diff --git a/app-crypt/archlinux-keyring/Manifest b/app-crypt/archlinux-keyring/Manifest
index 272eed7..8c82f22 100644
--- a/app-crypt/archlinux-keyring/Manifest
+++ b/app-crypt/archlinux-keyring/Manifest
@@ -2,21 +2,22 @@
 Hash: SHA256
 
 DIST archlinux-keyring-20200422.tar.gz 930137 BLAKE2B 8619936ebe240181e60affc3f9610e17074a1a13d62c5d32718342e50bc7778f679a8ba20b61b0dfd3a019a38f69d8a8f95446a27a48f7fa74bfac9456017222 SHA512 74526650f108b1778242a7a3036156eb72dca9c08cd1e4f67655603a5494044f0bd60a49e8d6c987c40cd4cbd02a491530633882f9e39a025cac1b032e341999
+DIST archlinux-keyring-20200603.tar.gz 935109 BLAKE2B 809a6c2d1a599a319ef6db1e0b187fb8e4d09dc2a4ba4feea92f098219946054ac8e4f73bc1620467da7647540d6c6d2b0d8802f559a3cc6b79bd4949d3a04cd SHA512 b5cd0b7f71e3542ca9698c504d49425391a921bf61c7239b707f80eec33a7e143772d7ced0466bb63eae10ac9061e6988e90cbaad54346a1df4f4d06415e804c
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCAB9FiEEcg3s4uUa4XE72XWQvF3CmYqtKyEFAl6hkwRfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEcg3s4uUa4XE72XWQvF3CmYqtKyEFAl7hQJtfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDcy
 MERFQ0UyRTUxQUUxNzEzQkQ5NzU5MEJDNURDMjk5OEFBRDJCMjEACgkQvF3CmYqt
-KyEbZBAAr2OapKAK0JfpAU7eDD78vSVpaMex988m8Ll8hAlqbBdFQqICFkdsGnWb
-frspPWA9KGyv6/1YPrj+FIoDPXjVwWJwSIPwwwfoi5uQmrPH+AxsHtVOXrRA6jvc
-hrCtrU/6iqDxbymGW87Oz3tIxUtqJhCZd4iZUJZ0xfyds3Ni7EJJsKA2rwLY4cbo
-MblLTkpc9piKiBkNBUsut7jE279CQZdis8atczdw/Y2B+xN7j0hIZUW10i5wvZxX
-vtktssuOWjgNqJktLTydmXGt2f2582uqXUsrpx2phxGLOU7IuIQ62bVX20tVfRDV
-jY4L2563+MxFZq3LcP0VaOBUGed33R16Lkk0ru1rzb/G7itdGgWKn1z7HKGSzRjd
-VEuYO86JgaEcf6G1fEQaeMVv6tR2iTG5RTQEQZEJ+S3uKO5hAVvoWgmGvHQVtCS/
-TGecPGZARxjuBHnN5LzkYuENw2e4TLkBgl0Xu21LQqnKsdq8SMUJxgfnCNWLKKrX
-G0xWhykUO72r3EJ3jSuAElHQ399OlAlg9S1X/1ypIlZ4QWYfGk+t6/WPFjWMpCEf
-CubsFzHLho0FmJog7urD4zR9CQ+sbJRfi/7VA4/4fgKsLtFChsnlx6uaBFXJ4tbL
-Wi4aD4tZhPlc5+okxRnEVVm669z1Z8Rrzxr99VKi3gNkKfqKXHM=
-=Hke8
+KyG74Q//eCO3XNFlRen8K3qNDMAWHKbCYV1uAJZPTBVcvR1f3eRJbwQTjSQd92fF
+D/B9rRZzKRWWX6tDTq4xQMUdM6Nf1ZKBlW/06qt1dcTwVYgew+EGrAqt5aHCA221
+ZVjzGc1NSs5qjsLx1f8ZtlP1MC6HBhzc1eFk33oG1lez/A0XbzS0qWW53pjnuWRd
+ZCGWgBsLtWqHqVAGgJJ4IgjJeuu3x9n091hu6b6qYiLVRQCu6q2RNTFXFyus160o
+Nce2MKek20VTR6rcynB0/pOubRN1fjXfWhPT4pAPRRWsW04HbuEZ9/znf07gehVW
+L+VN4ADqjxNzstq7nxQK1FZdQAAgp06f2t57Yz1/Haxq4zXhgMi0fWDPIoIOfVQc
+CgKh+38n8qNAi4bQ/2zlN3TTqFQjLRUUfC2qWTo4QT1f9333++i4BNLlWSfUZJUi
+H9Bcs1133sja4V+/qIraCHL2WvTlEKO5Wkqw2/Rc4jGF1UgJdV7n777PU3mx6LZT
+mG6tPvW51KzYV6ijgUTe5VjdsZ3MDWA6SPHoQivwl+dAd/0MZPnipw6dQQHSZMER
+Ze1GJEX5zKcqU9BZuv+EPxF41i/IM/y/vcNObmswHT7KU+sRO1EZbI54VJVuD9dV
+t+0R2I2Xrhb1PtaM5+Bmhrl3GfQGS/CmCABsV4mwJq0cRvgcjfc=
+=Dgu9
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/archlinux-keyring/archlinux-keyring-20200603.ebuild b/app-crypt/archlinux-keyring/archlinux-keyring-20200603.ebuild
new file mode 100644
index 0000000..5036f70
--- /dev/null
+++ b/app-crypt/archlinux-keyring/archlinux-keyring-20200603.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="GnuPG keyring of Archlinux developer keys"
+HOMEPAGE="https://git.archlinux.org/archlinux-keyring.git"
+SRC_URI="https://sources.archlinux.org/other/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2" # GPL?
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	# bluntly remove the makefile.
+	rm -f Makefile || die "Couldn't remove Makefile"
+
+	default
+}
+
+src_install() {
+	# Take the directory of sys-apps/pacman to have a sane default of
+	# upstream respectivly Archlinux.
+	insinto /usr/share/pacman/keyrings/
+	doins archlinux{.gpg,-trusted,-revoked}
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "This package only installs the keyring files while sys-apps/pacman"
+	einfo "initializes these keyrings to actually use it. This is a different"
+	einfo "behaviour from Archlinux, but is necessary to avoid circular deps."
+	einfo ""
+}