diff --git a/sys-apps/xbps/Manifest b/sys-apps/xbps/Manifest
new file mode 100644
index 0000000..20bef4d
--- /dev/null
+++ b/sys-apps/xbps/Manifest
@@ -0,0 +1 @@
+DIST 0.58.tar.gz 386287 BLAKE2B 31ab2f73945cb349e15092de5c969f4ceba7a17275cfd08f7310a43ef13d36b9a01f09a018a34e90f9a2ae0f177de2b542e4bac40e624eeac5175d781d9b356e SHA512 c4df413043aabb17ef9a21cbb58aa116d63d50ed2bcae7a38886ed077fcc72e3f4cbe9723e97b741b3c9403f836ac5edaea86092a7cd44ac29015c1bed483952
diff --git a/sys-apps/xbps/metadata.xml b/sys-apps/xbps/metadata.xml
new file mode 100644
index 0000000..fc3466c
--- /dev/null
+++ b/sys-apps/xbps/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <use>
+    <flag name="lto">Build with Link Time Optimization</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">void-linux/xbps</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sys-apps/xbps/xbps-0.58.ebuild b/sys-apps/xbps/xbps-0.58.ebuild
new file mode 100644
index 0000000..de7687e
--- /dev/null
+++ b/sys-apps/xbps/xbps-0.58.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="The X Binary Package System"
+HOMEPAGE="https://voidlinux.org/xbps"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/void-linux/xbps.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/void-linux/${PN}/archive/${PV}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+RESTRICT="!test? ( test ) mirror"
+LICENSE="BSD"
+SLOT="0"
+IUSE="debug doc lto static test"
+
+COMMON_DEPEND="
+	>=app-arch/libarchive-3.3.3[lz4,zstd]
+"
+BDEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+	doc? (
+		 app-doc/doxygen
+		 media-gfx/graphviz
+	)
+"
+DEPEND="
+	sys-libs/zlib
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	test? ( >=dev-libs/atf-0.15 )
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug fulldebug)
+		$(use_enable doc api-docs)
+		$(use_enable lto)
+		$(use_enable static)
+		$(use_enable test tests)
+	)
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	elog "WARNING! Use with caution!"
+	elog "XBPS may break your system."
+}
diff --git a/sys-apps/xbps/xbps-9999.ebuild b/sys-apps/xbps/xbps-9999.ebuild
new file mode 100644
index 0000000..de7687e
--- /dev/null
+++ b/sys-apps/xbps/xbps-9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="The X Binary Package System"
+HOMEPAGE="https://voidlinux.org/xbps"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/void-linux/xbps.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/void-linux/${PN}/archive/${PV}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+RESTRICT="!test? ( test ) mirror"
+LICENSE="BSD"
+SLOT="0"
+IUSE="debug doc lto static test"
+
+COMMON_DEPEND="
+	>=app-arch/libarchive-3.3.3[lz4,zstd]
+"
+BDEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+	doc? (
+		 app-doc/doxygen
+		 media-gfx/graphviz
+	)
+"
+DEPEND="
+	sys-libs/zlib
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	test? ( >=dev-libs/atf-0.15 )
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug fulldebug)
+		$(use_enable doc api-docs)
+		$(use_enable lto)
+		$(use_enable static)
+		$(use_enable test tests)
+	)
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	elog "WARNING! Use with caution!"
+	elog "XBPS may break your system."
+}