diff --git a/patch/ros-jazzy-ros2cli.patch b/patch/ros-jazzy-ros2cli.patch
new file mode 100644
index 000000000..480c11462
--- /dev/null
+++ b/patch/ros-jazzy-ros2cli.patch
@@ -0,0 +1,19 @@
+diff --git a/ros2cli/setup.py b/ros2cli/setup.py
+index 232c5bc..d774f33 100644
+--- a/ros2cli/setup.py
++++ b/ros2cli/setup.py
+@@ -20,6 +20,14 @@ setup(
+             'completion/ros2-argcomplete.bash',
+             'completion/ros2-argcomplete.zsh'
+         ]),
++
++        # [pixi] install autocompletion scripts
++        ('share/bash-completion/completions', [
++            'completion/ros2-argcomplete.bash',
++        ]),
++        ('share/zsh/site-functions', [
++            'completion/ros2-argcomplete.zsh'
++        ]),
+     ],
+     zip_safe=False,
+     author='Dirk Thomas',
diff --git a/patch/ros-jazzy-rosidl.patch b/patch/ros-jazzy-rosidl.patch
new file mode 100644
index 000000000..b3cd6f5f6
--- /dev/null
+++ b/patch/ros-jazzy-rosidl.patch
@@ -0,0 +1,19 @@
+diff --git a/rosidl_cli/setup.py b/rosidl_cli/setup.py
+index bacc9e8..b4fd32c 100644
+--- a/rosidl_cli/setup.py
++++ b/rosidl_cli/setup.py
+@@ -20,6 +20,14 @@ setup(
+             'completion/rosidl-argcomplete.bash',
+             'completion/rosidl-argcomplete.zsh'
+         ]),
++
++        # [pixi] install autocompletion scripts
++        ('share/bash-completion/completions', [
++            'completion/rosidl-argcomplete.bash',
++        ]),
++        ('share/zsh/site-functions', [
++            'completion/rosidl-argcomplete.zsh'
++        ]),
+     ],
+     zip_safe=False,
+     author='Michel Hidalgo',
diff --git a/pkg_additional_info.yaml b/pkg_additional_info.yaml
index 316ff1cf0..b50d3e15a 100644
--- a/pkg_additional_info.yaml
+++ b/pkg_additional_info.yaml
@@ -195,5 +195,10 @@ uncrustify_vendor:
   build_number: 17
 ament_xmllint:
   build_number: 17
+
+rosidl_cli:
+  build_number: 17
+ros2cli:
+  build_number: 17
 tf_transformations:
   build_number: 17
diff --git a/tests/ros-jazzy-ros2cli.yaml b/tests/ros-jazzy-ros2cli.yaml
new file mode 100644
index 000000000..3429fb3ee
--- /dev/null
+++ b/tests/ros-jazzy-ros2cli.yaml
@@ -0,0 +1,7 @@
+tests:
+  # Regression test for https://github.com/RoboStack/ros-humble/issues/271
+  - script:
+    - if: unix
+      then:
+        - test -f ${PREFIX}/share/bash-completion/completions/ros2-argcomplete.bash
+        - test -f ${PREFIX}/share/zsh/site-functions/ros2-argcomplete.zsh
diff --git a/tests/ros-jazzy-rosidl.yaml b/tests/ros-jazzy-rosidl.yaml
new file mode 100644
index 000000000..9a42672a3
--- /dev/null
+++ b/tests/ros-jazzy-rosidl.yaml
@@ -0,0 +1,7 @@
+tests:
+  # Regression test for https://github.com/RoboStack/ros-humble/issues/271
+  - script:
+    - if: unix
+      then:
+        - test -f ${PREFIX}/share/bash-completion/completions/rosidl-argcomplete.bash
+        - test -f ${PREFIX}/share/zsh/site-functions/rosidl-argcomplete.zsh