diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 5762e921e..080e0be9d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -59,6 +59,8 @@ Completions
 - ``gimp`` (:issue:`9904`).
 - ``horcrux`` (:issue:`9922`).
 - ``java_home`` (:issue:`9998`).
+- ``crc`` (:issue:`10034`).
+- ``oc`` (:issue:`10034`).
 
 Improved terminal support
 ^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/share/completions/crc.fish b/share/completions/crc.fish
new file mode 100644
index 000000000..de2272d30
--- /dev/null
+++ b/share/completions/crc.fish
@@ -0,0 +1 @@
+crc completion fish | source
diff --git a/share/completions/oc.fish b/share/completions/oc.fish
new file mode 100644
index 000000000..26a7881cb
--- /dev/null
+++ b/share/completions/oc.fish
@@ -0,0 +1 @@
+oc completion fish | source