diff --git a/aliases.d/taskwarrior b/aliases.d/taskwarrior
index f61563d..cec5df0 100644
--- a/aliases.d/taskwarrior
+++ b/aliases.d/taskwarrior
@@ -1,6 +1,7 @@
+#
 # Aliases for taskwarrior
 #
-if (which task &> /dev/null)
+if (command -v task &> /dev/null)
 then
   alias t='task'
   alias tl='task list'
diff --git a/completion.d/taskwarrior b/completion.d/taskwarrior
new file mode 100644
index 0000000..8953bd7
--- /dev/null
+++ b/completion.d/taskwarrior
@@ -0,0 +1,7 @@
+#
+# Completion for taskwarrior
+#
+if (command -v task &> /dev/null)
+then
+  complete -o nospace -F _task t
+fi