diff --git a/tasks/completion.json b/tasks/completion.json
new file mode 100644
index 0000000..b9eec6d
--- /dev/null
+++ b/tasks/completion.json
@@ -0,0 +1,3 @@
+{
+  "description": "Setup choria completion"
+}
diff --git a/tasks/completion.sh b/tasks/completion.sh
new file mode 100644
index 0000000..6f9a2d2
--- /dev/null
+++ b/tasks/completion.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+mkdir -p /usr/share/bash-completion /usr/share/zsh/vendor-completions
+choria completion --bash > /usr/share/bash-completion/completions/choria
+choria completion --zsh > /usr/share/zsh/vendor-completions/_choria