diff --git a/app-admin/cgtop/Manifest b/app-admin/cgtop/Manifest
index 0e7a4c8..9a56e1c 100644
--- a/app-admin/cgtop/Manifest
+++ b/app-admin/cgtop/Manifest
@@ -1 +1,2 @@
 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
+DIST systemd-247.tar.gz 9887080 BLAKE2B b3b9399b0e0258453e1ea0bee1212bca7998d0c762fc2da1a3ee6f239bcdde5aa33cb6b7bab377f5dfcb029205b31b733589dbac463ec75cf0b6d371edc9c20f SHA512 dd11cf46e5d9cbf44beb2d383262e9b13eb80fbb3403d86d011b4c2f9e0a4778c7c9779c856960f5654177581c20d7336c00ce687d35fe35ce069c56924604c2
diff --git a/app-admin/cgtop/cgtop-247.ebuild b/app-admin/cgtop/cgtop-247.ebuild
new file mode 100644
index 0000000..d79bdaf
--- /dev/null
+++ b/app-admin/cgtop/cgtop-247.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Based on:
+# - https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+# - https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-boot/systemd-boot/systemd-boot-245.ebuild
+# Difference: Is is possible to install this on a system running systemd.
+
+EAPI=7
+
+MINKV="3.11"
+
+inherit meson
+
+DESCRIPTION="cgtop from systemd"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+else
+	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+# No tests for this one (if I mised them let me know)
+RESTRICT="mirror test"
+LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+IUSE="selinux"
+
+BDEPEND="
+	>=dev-util/intltool-0.50
+	>=dev-util/meson-0.46
+	>=sys-apps/coreutils-8.16
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	sys-devel/m4
+	virtual/pkgconfig
+"
+DEPEND="
+	>=sys-apps/util-linux-2.30:0=
+	>=sys-kernel/linux-headers-${MINKV}
+	sys-apps/acl:0=
+	sys-libs/libcap:0=
+	selinux? ( sys-libs/libselinux:0= )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/systemd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/246-${PN}-libshared-static.patch"
+)
+
+src_configure() {
+	local systemd_disable_options=(
+		adm-group
+		analyze
+		apparmor
+		audit
+		backlight
+		binfmt
+		blkid
+		bzip2
+		coredump
+		dbus
+		efi
+		elfutils
+		environment-d
+		fdisk
+		firstboot
+		gcrypt
+		glib
+		gnutls
+		gshadow
+		hibernate
+		hostnamed
+		hwdb
+		idn
+		ima
+		initrd
+		kernel-install
+		kmod
+		ldconfig
+		libcryptsetup
+		libcurl
+		libfido2
+		libidn
+		libidn2
+		libiptc
+		link-networkd-shared
+		link-systemctl-shared
+		link-timesyncd-shared
+		link-udev-shared
+		localed
+		logind
+		lz4
+		machined
+		microhttpd
+		networkd
+		nss-myhostname
+		nss-resolve
+		nss-systemd
+		openssl
+		p11kit
+		pam
+		pcre2
+		polkit
+		portabled
+		pstore
+		pwquality
+		qrencode
+		quotacheck
+		randomseed
+		resolve
+		rfkill
+		seccomp
+		smack
+		sysusers
+		timedated
+		timesyncd
+		tmpfiles
+		tpm
+		userdb
+		utmp
+		vconsole
+		wheel-group
+		xdg-autostart
+		xkbcommon
+		xz
+		zlib
+		zstd
+	)
+	# prepend -D and append =false, e.g. zstd becomes -Dzstd=false
+	systemd_disable_options=( ${systemd_disable_options[@]/#/-D} )
+	systemd_disable_options=( ${systemd_disable_options[@]/%/=false} )
+
+	local emesonargs=(
+		-Dacl=true
+		-Dstandalone-binaries=true
+		-Dstatic-libsystemd=true
+		-Dsysvinit-path=''
+		${systemd_disable_options[@]}
+		$(meson_use selinux)
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	local mytargets=(
+		systemd-cgtop
+		man/systemd-cgtop.1
+	)
+	meson_src_compile "${mytargets[@]}"
+}
+
+src_install() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+
+	newbin systemd-cgtop cgtop
+	newman man/systemd-cgtop.1 cgtop.1
+
+	popd >/dev/null || die
+}