diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..21128bb
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,3 @@
+# Contains a gentoo/stage3 with required tools to rebuild manifests.'
+FROM gentoo/stage3
+RUN emerge-webrsync
\ No newline at end of file
diff --git a/app-admin/chezmoi-bin/Manifest b/app-admin/chezmoi-bin/Manifest
index 52a493d..708a466 100644
--- a/app-admin/chezmoi-bin/Manifest
+++ b/app-admin/chezmoi-bin/Manifest
@@ -1,5 +1,5 @@
-DIST chezmoi_2.40.4_linux_amd64.deb 11758186 BLAKE2B 0c59139eb0262c96ac17328ae5b594c73829de4f3102fde49bea6741ac9e06843703c5b9052f6c18d5309636f1042041f21c7b33dce2c30b5225317126efe9f2 SHA512 ef8ef05a3d2037d5be75261c68e8c54274aa5e3e25ad98295f9211bab17e0274f57edf7db5247e48c7944ed511948dc6e8fb72d43763f985ddd7799ba54683f8
-DIST chezmoi_2.40.4_linux_arm64.deb 10669508 BLAKE2B cfc7056be4da8ba535af1eb97139d3239d159a87c4098d7873cc6dfed3f01ddd1c23e7fdfbc59c92192354969ab5ff10d4629f8734cc1916728de1e9a2809aec SHA512 bc76055fdba8a6a0ed1ac35e4e000666966bd7f5720fd69348f39ac052ef32121da10b81d830bff9e1dc37db31198d835eceb9d1ee03378c92c6c1d967fb79d9
-DIST chezmoi_2.40.4_linux_armel.deb 11103842 BLAKE2B 9252fcfcf15fcd667f3620379826ca7330cd218f9579022e1412e6ba35b57f0293ee9ed57836a500c3e7c5bdf64f7d9954698978d7189e88b0bf832294543485 SHA512 24e6a6a5122479f1de4a5f841c7f2bf30ad31ad550d08eed55fa711b623959611b7976177913aba51bd8c8279fffd6dd4d1b4ce30ec5d63ea07f450d504362f2
-DIST chezmoi_2.40.4_linux_i386.deb 10837158 BLAKE2B 7e08d3276309afcf311ec2e3c6c210e2cb050e2c33200cf15d6a38ee083db30088df2eb6e3dd9588a331389f6a0372508d705b1c7a2e91a2fabbf01f8e440861 SHA512 7a4dafeb080de59f0e167bacf6cc928fd55174c6fa6b16dc6379ff1987d6673d35766efa2b47cf9317a56eefb4c6dde898a136ae82e206463bd9756ff49e0d33
-DIST chezmoi_2.40.4_linux_ppc64.deb 10412672 BLAKE2B 3df4837e717f55154c8e7908e54c60e8921c0a6989998cb2c23924fda832af4414b3935271207363c8b249064f03ea3247192d75861005afd4eb581a5b2f33de SHA512 b3a14b689bc1834ddb451f0d0dced0083c24b5c89788c4fc5bdcaba8d2607434a1fd37a2436583a0548a9dde974a66055b69a866a64417e1ef75d38248367126
+DIST chezmoi_2.41.0_linux_amd64.deb 11869230 BLAKE2B 55fe4b0d279a9d975e4a9744902f6c5f0582e6a5e25eadd0002741fb89a5142ba85fe2a1df4ce30cfd7e1eb925b7689d6d2d9d6e63865ce2f8091abc0118b363 SHA512 98d5fc917aa896c39cf6a62e41751d054645f7d46499d429638d2a676008157db5a46421f7a7f2b31d4f22b3e7e5f120b4181a7621e6786ef9b7ee310e45d648
+DIST chezmoi_2.41.0_linux_arm64.deb 10772306 BLAKE2B a05180610fad4ff3bbd20e72572542c0c26c9205e4501b5982991413ff0fc033572d5af97f55682168848a2b6a9ecd7194f3703a7d4d4f9a58a8939093121f60 SHA512 27399f1b06419913de5938dc75ebd99046bf281253f50c8d1f1c8c1f3baa29b3e50978fa9102df266aedcfd277eb09c902d01bd4d1a8d6cec155a1b8e19b8eb1
+DIST chezmoi_2.41.0_linux_armel.deb 11211652 BLAKE2B a9eb2ec731b36b25ca6d5bbb7f476bd03953a2d7dccba4859c132c4b12217072f8006be693d7a7202305593b43eaaac1e4743273ec5b5fb42459fd7412e620ab SHA512 ba3018715d61cc55364603ff74d42a5e7041c4dc323df10854d50aff5d3d54890b98764f9dbdc548d3e950b6776d5147a628632a7dc70c6573e64427cf4274c8
+DIST chezmoi_2.41.0_linux_i386.deb 10932912 BLAKE2B de590420eaf031e801f27d2e1921d5bbe402ac7e48c6b99d16cad33cb9f28cbf21b9ba3240a30ff9665f000581ade083e508f2328bf72e19e77f4ab7786617f3 SHA512 069f915225462cc694601b66ec6b191f5eac46e85e781750c3d328a3c77dee855fad3d46bc560cae3f12678226aa3cb5d52ef0611cf0869cdfe02595be9d4708
+DIST chezmoi_2.41.0_linux_ppc64.deb 10516378 BLAKE2B cb977eb889225bb5004ad69943539f04385d2087e222d877c682a90f714abf2e630ac2c0b32da5caa86c7c2412c729ba8ec2a044e35c15521f7d3eb7141a1a6c SHA512 ff88a57deec905a03b9e100b531d84c078bc1a7c0282dbe636da345a78b399bd038ddb1c59884d252f3030f16876047c256cae4268f9a9e333c95d3c2a0d95a3
diff --git a/app-admin/chezmoi-bin/chezmoi-bin-2.40.4.ebuild b/app-admin/chezmoi-bin/chezmoi-bin-2.41.0.ebuild
similarity index 100%
rename from app-admin/chezmoi-bin/chezmoi-bin-2.40.4.ebuild
rename to app-admin/chezmoi-bin/chezmoi-bin-2.41.0.ebuild
diff --git a/rebuild-manifest.sh b/rebuild-manifest.sh
new file mode 100644
index 0000000..cea1b29
--- /dev/null
+++ b/rebuild-manifest.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# Rebuilds a Manifest file for the provided ebuild.
+
+ebuild_path="$1"
+
+if [[ -z "$ebuild_path" ]]; then
+  echo "Error: Missing ebuild path" >&1
+  exit 1
+fi
+
+if [[ ! -d "$ebuild_path" ]]; then
+  echo "Error: Invalid ebuild path (must be directory)" >&1
+  exit 1
+fi
+
+docker buildx build --load -t gentoo-ebuild-manifest-rebuild .
+exec docker run --rm -it -v "$(pwd):/host_mnt" gentoo-ebuild-manifest-rebuild bash -ce 'cd "/host_mnt/$1" && ebuild *.ebuild manifest' -- "$ebuild_path"