diff --git a/etckeeper-1.18.18.tar.gz b/etckeeper-1.18.18.tar.gz
deleted file mode 100644
index 116f71a..0000000
--- a/etckeeper-1.18.18.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:390c82d1fcfaf4cac5a3ca6fffb16fea0e1ada31a1bfe20220ac3b317d663f61
-size 101845
diff --git a/etckeeper-1.18.21.tar.gz b/etckeeper-1.18.21.tar.gz
new file mode 100644
index 0000000..224b993
--- /dev/null
+++ b/etckeeper-1.18.21.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a87c5e9c847c29f761da933c1cd907779545c7ddf92fb75de8ef692b90fc9e5d
+size 116961
diff --git a/etckeeper-set-package-manager.patch b/etckeeper-set-package-manager.patch
index f6e1449..b464b1f 100644
--- a/etckeeper-set-package-manager.patch
+++ b/etckeeper-set-package-manager.patch
@@ -1,16 +1,16 @@
-Index: etckeeper-1.18.8/etckeeper.conf
+Index: etckeeper-1.18.21/etckeeper.conf
 ===================================================================
---- etckeeper-1.18.8.orig/etckeeper.conf
-+++ etckeeper-1.18.8/etckeeper.conf
+--- etckeeper-1.18.21.orig/etckeeper.conf
++++ etckeeper-1.18.21/etckeeper.conf
 @@ -33,11 +33,11 @@ DARCS_COMMIT_OPTIONS="-a"
  
  # The high-level package manager that's being used.
- # (apt, pacman, pacman-g2, yum, dnf, zypper, apk, xbps etc)
+ # (apt, pacman, pacman-g2, yum, dnf, zypper, apk, xbps, emerge, cave, etc)
 -HIGHLEVEL_PACKAGE_MANAGER=apt
 +HIGHLEVEL_PACKAGE_MANAGER=zypper
  
  # The low-level package manager that's being used.
- # (dpkg, rpm, pacman, pacmatic, pacman-g2, apk, xbps etc)
+ # (dpkg, rpm, pacman, pacmatic, pacman-g2, apk, xbps, cave, qlist, etc)
 -LOWLEVEL_PACKAGE_MANAGER=dpkg
 +LOWLEVEL_PACKAGE_MANAGER=rpm
  
diff --git a/etckeeper.changes b/etckeeper.changes
index ebd5a8e..5b6d41a 100644
--- a/etckeeper.changes
+++ b/etckeeper.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Thu Aug  8 11:16:35 UTC 2024 - ecsos <ecsos@opensuse.org>
+
+- Update to 1.18.21
+  - Consistently use mktemp if available, falling back to tempfile
+     otherwise.
+- Changes from 1.18.20
+  - Fix a reversion in etckeeper init in version 1.18.19.
+- Changes from 1.18.19
+  - Added support for Gentoo (emerge, qlist, and cave)
+  - Skip running pre-commit hook inside linked worktrees,
+    to avoid it updating .etckeeper with the permissions of
+    files not in /etc.
+  - commit: Run bzr with --quiet, since it outputs non-errors to
+    stderr. Closes: #1018874
+- Rebase etckeeper-set-package-manager.patch
+
 -------------------------------------------------------------------
 Wed Feb 21 15:42:14 UTC 2024 - Michael Vetter <mvetter@suse.com>
 
@@ -350,4 +367,3 @@ Wed Aug 21 16:59:59 UTC 2013 - dvaleev@suse.com
 Sat Aug 10 10:33:54 CET 2013 - pascal.bleser@opensuse.org
 
 - initial version (1.7)
-
diff --git a/etckeeper.spec b/etckeeper.spec
index 5aeb979..f92e5f7 100644
--- a/etckeeper.spec
+++ b/etckeeper.spec
@@ -34,7 +34,7 @@
 %define make_args systemddir=%{_unitdir} PYTHON=%{python_versioned} %{python_args}
 
 Name:           etckeeper
-Version:        1.18.18
+Version:        1.18.21
 Release:        0
 Summary:        Store /etc under Version Control
 License:        GPL-2.0-or-later