diff --git a/zsh/completions/_ag b/zsh/completions/_ag
new file mode 100755
index 00000000..0d990d61
--- /dev/null
+++ b/zsh/completions/_ag
@@ -0,0 +1,7 @@
+#compdef ag
+
+if (( CURRENT == 2 )); then
+  compadd $(cut -f 1 tmp/tags .git/tags 2>/dev/null)
+else;
+  _files
+fi
diff --git a/zsh/completions/_rspec b/zsh/completions/_rspec
new file mode 100755
index 00000000..e75c1825
--- /dev/null
+++ b/zsh/completions/_rspec
@@ -0,0 +1,3 @@
+#compdef rspec
+
+compadd -P spec/ $(ls spec/**/*_spec.rb | sed -E "s/spec\///g")