diff --git a/files.systemd b/files.systemd
index c9531766..8e3481a9 100644
--- a/files.systemd
+++ b/files.systemd
@@ -124,7 +124,6 @@
 %{_bindir}/timedatectl
 %if %{without bootstrap}
 %{_datadir}/bash-completion/completions/busctl
-%{_datadir}/bash-completion/completions/coredumpctl
 %{_datadir}/bash-completion/completions/hostnamectl
 %{_datadir}/bash-completion/completions/journalctl
 %{_datadir}/bash-completion/completions/localectl
@@ -188,7 +187,6 @@
 %{_datadir}/systemd/language-fallback-map
 %if %{without bootstrap}
 %{_datadir}/zsh/site-functions/_busctl
-%{_datadir}/zsh/site-functions/_coredumpctl
 %{_datadir}/zsh/site-functions/_hostnamectl
 %{_datadir}/zsh/site-functions/_journalctl
 %{_datadir}/zsh/site-functions/_localectl
diff --git a/systemd.changes b/systemd.changes
index 870cfb44..9c27984a 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Apr  7 19:27:11 UTC 2022 - Franck Bui <fbui@suse.com>
+
+- Move coredumpctl completion files into systemd-coredump sub-package.
+
 -------------------------------------------------------------------
 Wed Apr  6 09:55:10 UTC 2022 - Franck Bui <fbui@suse.com>
 
diff --git a/systemd.spec b/systemd.spec
index de7564f1..745280cc 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -1317,6 +1317,8 @@ fi
 %config(noreplace) %{_sysconfdir}/systemd/coredump.conf
 %dir %{_localstatedir}/lib/systemd/coredump
 %if %{without bootstrap}
+%{_datadir}/bash-completion/completions/coredumpctl
+%{_datadir}/zsh/site-functions/_coredumpctl
 %{_mandir}/man1/coredumpctl*
 %{_mandir}/man5/coredump.conf*
 %{_mandir}/man8/systemd-coredump*