diff --git a/kubernetes1.24.changes b/kubernetes1.24.changes
index 43776d1..86335b8 100644
--- a/kubernetes1.24.changes
+++ b/kubernetes1.24.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar 15 16:35:21 UTC 2023 - Robert Munteanu <rombert@apache.org>
+
+-  Split individual completions into separate packages
+
 -------------------------------------------------------------------
 Thu Mar  9 10:15:46 UTC 2023 - Robert Munteanu <rombert@apache.org>
 
diff --git a/kubernetes1.24.spec b/kubernetes1.24.spec
index 8feb6e2..e98cb6e 100644
--- a/kubernetes1.24.spec
+++ b/kubernetes1.24.spec
@@ -69,12 +69,7 @@ It groups containers that make up an application into logical units
 for management and discovery.
 
 
-
-
-
-
 # packages to build containerized control plane
-
 %package apiserver
 Summary:        Kubernetes apiserver for container image
 Group:          System/Management
@@ -177,13 +172,32 @@ Requires:       kubernetes%{baseversion}-client
 Provides:       kubernetes-client-common = %{version}
 Conflicts:      kubernetes-client-common
 Obsoletes:      kubernetes%{baseversionminus1}-client-common
-Obsoletes:      kubernetes-client-fish-completion
-Recommends:     bash-completion
-Recommends:     fish
 
 %description client-common
 Kubernetes client tools common files
 
+%package client-bash-completion
+Summary:        Bash Completion for %{name}-client
+Group:          System/Shells
+Requires:       %{name}-client = %{version}
+Requires:       bash-completion
+Supplements:    (%{name}-client and bash-completion)
+BuildArch:      noarch
+
+%description client-bash-completion
+Bash command line completion support for %{name}-client
+
+%package client-fish-completion
+Summary:        Fish Completion for %{name}-client
+Group:          System/Shells
+Requires:       %{name}-client = %{version}
+Supplements:    (%{name}-client and fish)
+BuildArch:      noarch
+Obsoletes:      kubernetes-client-fish-completion
+
+%description client-fish-completion
+Fish command line completion support for %{name}.
+
 %prep
 %setup -q -n kubernetes-%{version}
 %patch2 -p1
@@ -413,7 +427,11 @@ fi
 %license LICENSE
 %{_mandir}/man1/kubectl.1%{?ext_man}
 %{_mandir}/man1/kubectl-*
+
+%files client-bash-completion
 %{_datadir}/bash-completion/completions/kubectl
+
+%files client-fish-completion
 %{_datadir}/fish/vendor_completions.d/kubectl.fish
 
 %changelog