diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.3.0-r5.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.3.0-r5.ebuild
new file mode 100644
index 000000000..1e394861c
--- /dev/null
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.3.0-r5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="7"
+PYTHON_COMPAT=(python3_9)
+
+SRC_URI="https://git.calculate-linux.org/calculate/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+DESCRIPTION="Collection of administration scripts for Calculate"
+HOMEPAGE="https://www.calculate-linux.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S=${WORKDIR}/${PN}
+
+RDEPEND=">=sys-apps/calculate-utils-3.6
+	app-arch/zstd
+	app-arch/xz-utils"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-check-lxc.patch
+	"${FILESDIR}"/${P}-workdir.patch
+	"${FILESDIR}"/${P}-no-validate.patch
+	"${FILESDIR}"/${P}-root.patch
+)
diff --git a/sys-apps/calculate-toolkit/files/calculate-toolkit-0.3.0-root.patch b/sys-apps/calculate-toolkit/files/calculate-toolkit-0.3.0-root.patch
new file mode 100644
index 000000000..4e8c1ff29
--- /dev/null
+++ b/sys-apps/calculate-toolkit/files/calculate-toolkit-0.3.0-root.patch
@@ -0,0 +1,16 @@
+diff --git a/cl-lxc b/cl-lxc
+index 98b73a9..0ab9dd5 100755
+--- a/cl-lxc
++++ b/cl-lxc
+@@ -600,6 +600,11 @@ upgrade_lxc() {
+ 	   $path_work/$name_upgrading/rootfs$num_next/etc/conf.d/net
+ 	eend
+ 
++	ebegin $"Copying hash of root password"
++	root=$(grep '^root:' $path_work/$name_upgrading/rootfs$num_cur/etc/shadow | sed 's/:/\\:/g')
++	sed -i "s:^root\:.*$:$root:" $path_work/$name_upgrading/rootfs$num_next/etc/shadow
++	eend
++
+ 	ebegin $"Preparing first boot setup script"
+ cat << EOL > $path_work/$name_upgrading/rootfs$num_next/etc/local.d/firststart.start
+ cl-core --method setup_system --no-progress --usenew-conf --network on