diff --git a/backport-refactor-secret-tool-deprecate-ours-in-favor-of-upstream.patch b/backport-refactor-secret-tool-deprecate-ours-in-favor-of-upstream.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b01081148d7164e9298eb983a1bd12b93dc72a48
--- /dev/null
+++ b/backport-refactor-secret-tool-deprecate-ours-in-favor-of-upstream.patch
@@ -0,0 +1,64 @@
+From af8a80d8916edd4a1c146afb2743651b6c3ca406 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
+Date: Tue, 21 Jan 2025 23:54:41 +0200
+Subject: [PATCH] refactor(secret-tool): deprecate ours in favor of upstream
+
+Closes https://github.com/scop/bash-completion/issues/1317
+---
+ completions/Makefile.am                   | 2 +-
+ completions/{secret-tool => _secret-tool} | 3 +++
+ test/fallback/completions/Makefile.am     | 1 +
+ test/fallback/completions/secret-tool     | 1 +
+ 4 files changed, 6 insertions(+), 1 deletion(-)
+ rename completions/{secret-tool => _secret-tool} (93%)
+ create mode 120000 test/fallback/completions/secret-tool
+
+diff --git a/completions/Makefile.am b/completions/Makefile.am
+index 899bec5259d..21b6f9e49f0 100644
+--- a/completions/Makefile.am
++++ b/completions/Makefile.am
+@@ -398,7 +398,7 @@ cross_platform = 2to3 \
+ 		sbopkg \
+ 		screen \
+ 		scrub \
+-		secret-tool \
++		_secret-tool \
+ 		set \
+ 		sh \
+ 		sha256sum \
+diff --git a/completions/secret-tool b/completions/_secret-tool
+similarity index 93%
+rename from completions/secret-tool
+rename to completions/_secret-tool
+index e8aafd81aef..862bfa8c73d 100644
+--- a/completions/secret-tool
++++ b/completions/_secret-tool
+@@ -1,5 +1,8 @@
+ # bash completion for secret-tool(1)                       -*- shell-script -*-
+ 
++# Use of this file is deprecated. Upstream completion is available in
++# libsecret >= 0.20.5, use that instead.
++
+ _comp_cmd_secret_tool()
+ {
+     local cur prev words cword was_split comp_args
+diff --git a/test/fallback/completions/Makefile.am b/test/fallback/completions/Makefile.am
+index 28358b4e7d6..24e9c9755ff 100644
+--- a/test/fallback/completions/Makefile.am
++++ b/test/fallback/completions/Makefile.am
+@@ -46,6 +46,7 @@ EXTRA_DIST = \
+ 	ruff \
+ 	runuser \
+ 	rustup \
++	secret-tool \
+ 	slackpkg \
+ 	sops \
+ 	stern \
+diff --git a/test/fallback/completions/secret-tool b/test/fallback/completions/secret-tool
+new file mode 120000
+index 00000000000..ab0a8361057
+--- /dev/null
++++ b/test/fallback/completions/secret-tool
+@@ -0,0 +1 @@
++../../../completions/_secret-tool
+\ No newline at end of file
diff --git a/bash-completion.spec b/bash-completion.spec
index 05abe545ff9f6389769bf80ec3ce275d384b31dd..b942a2ab1d45215e663b14576e4f17c075ee6bab 100644
--- a/bash-completion.spec
+++ b/bash-completion.spec
@@ -3,7 +3,7 @@
 
 Name:          bash-completion
 Version:       2.16.0
-Release:       1
+Release:       2
 Epoch:         1
 Summary:       Completion for bash command
 License:       GPL-2.0-or-later
@@ -11,6 +11,7 @@ URL:           https://github.com/scop/bash-completion
 Source0:       https://github.com/scop/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
 
 Patch0:        bash-completion-2.16.0-remove-python2.patch
+Patch6001:     backport-refactor-secret-tool-deprecate-ours-in-favor-of-upstream.patch
 
 BuildArch:     noarch
 
@@ -65,6 +66,9 @@ make -C completions check
 %doc CHANGELOG.md README.md doc/configuration.md CONTRIBUTING.md
 
 %changelog
+* Tue Jan 28 2025 Funda Wang <fundawang@yeah.net> - 1:2.16.0-2
+- Do not ship secret-tool scriptlet
+
 * Sun Dec 29 2024 Funda Wang <fundawang@yeah.net> - 1:2.16.0-1
 - update to 2.16.0