diff --git a/functions/brew/_brew b/functions/brew/_brew
new file mode 100644
index 00000000..4e590ac6
--- /dev/null
+++ b/functions/brew/_brew
@@ -0,0 +1,69 @@
+#compdef brew
+#autoload
+
+# imported from the latest homebrew contributions
+
+_brew_all_formulae() {
+ formulae=(`brew search`)
+}
+
+_brew_installed_formulae() {
+ installed_formulae=(`brew list`)
+}
+
+local -a _1st_arguments
+_1st_arguments=(
+ 'cat:display formula file for a formula'
+ 'cleanup:uninstall unused and old versions of packages'
+ 'create:create a new formula'
+ 'deps:list dependencies and dependants of a formula'
+ 'doctor:audits your installation for common issues'
+ 'edit:edit a formula'
+ 'home:visit the homepage of a formula or the brew project'
+ 'info:information about a formula'
+ 'install:install a formula'
+ 'link:link a formula'
+ 'list:list files in a formula or not-installed formulae'
+ 'log:git commit log for a formula'
+ 'outdated:list formulas for which a newer version is available'
+ 'prune:remove dead links'
+ 'remove:remove a formula'
+ 'search:search for a formula (/regex/ or string)'
+ 'unlink:unlink a formula'
+ 'update:freshen up links'
+ 'uses:show formulas which depend on a formula'
+)
+
+local expl
+local -a formula installed_formulae
+
+_arguments \
+ '(-v --verbose)'{-v,--verbose}'[verbose]' \
+ '(--version)--version[version information]' \
+ '(--prefix)--prefix[where brew lives on this system]' \
+ '(--cache)--cache[brew cache]' \
+ '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+ _describe -t commands "brew subcommand" _1st_arguments
+ return
+fi
+
+case "$words[1]" in
+ list)
+ _arguments \
+ '(--unbrewed)--unbrewed[files in brew --prefix not controlled by brew]' \
+ '1: :->forms' && return 0
+
+ if [[ "$state" == forms ]]; then
+ _brew_installed_formulae
+ _requested installed_formulae expl 'installed formulae' compadd -a installed_formulae
+ fi ;;
+ install|home|log|info|uses|cat|deps)
+ _brew_all_formulae
+ _wanted formulae expl 'all formulae' compadd -a formulae ;;
+ remove|edit|xo)
+ _brew_installed_formulae
+ _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae ;;
+esac
+
diff --git a/functions/gem/_gem b/functions/gem/_gem
new file mode 100644
index 00000000..83cba40d
--- /dev/null
+++ b/functions/gem/_gem
@@ -0,0 +1,64 @@
+#compdef gem
+#autoload
+
+# gem zsh completion, based on homebrew completion
+
+_gem_installed() {
+ installed_gems=(`gem list --local --no-versions`)
+}
+
+local -a _1st_arguments
+_1st_arguments=(
+ 'cert:Manage RubyGems certificates and signing settings'
+ 'check:Check installed gems'
+ 'cleanup:Clean up old versions of installed gems in the local repository'
+ 'contents:Display the contents of the installed gems'
+ 'dependency:Show the dependencies of an installed gem'
+ 'environment:Display information about the RubyGems environment'
+ 'fetch:Download a gem and place it in the current directory'
+ 'generate_index:Generates the index files for a gem server directory'
+ 'help:Provide help on the `gem` command'
+ 'install:Install a gem into the local repository'
+ 'list:Display gems whose name starts with STRING'
+ 'lock:Generate a lockdown list of gems'
+ 'mirror:Mirror a gem repository'
+ 'outdated:Display all gems that need updates'
+ 'owner:Manage gem owners on RubyGems.org.'
+ 'pristine:Restores installed gems to pristine condition from files located in the gem cache'
+ 'push:Push a gem up to RubyGems.org'
+ 'query:Query gem information in local or remote repositories'
+ 'rdoc:Generates RDoc for pre-installed gems'
+ 'search:Display all gems whose name contains STRING'
+ 'server:Documentation and gem repository HTTP server'
+ 'sources:Manage the sources and cache file RubyGems uses to search for gems'
+ 'specification:Display gem specification (in yaml)'
+ 'stale:List gems along with access times'
+ 'uninstall:Uninstall gems from the local repository'
+ 'unpack:Unpack an installed gem to the current directory'
+ 'update:Update the named gems (or all installed gems) in the local repository'
+ 'which:Find the location of a library file you can require'
+)
+
+local expl
+local -a gems installed_gems
+
+_arguments \
+ '(-v --version)'{-v,--version}'[show version]' \
+ '(-h --help)'{-h,--help}'[show help]' \
+ '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+ _describe -t commands "gem subcommand" _1st_arguments
+ return
+fi
+
+case "$words[1]" in
+ list)
+ if [[ "$state" == forms ]]; then
+ _gem_installed
+ _requested installed_gems expl 'installed gems' compadd -a installed_gems
+ fi ;;
+ uninstall|update)
+ _gem_installed
+ _wanted installed_gems expl 'installed gems' compadd -a installed_gems ;;
+esac
diff --git a/functions/pip/_pip b/functions/pip/_pip
new file mode 100644
index 00000000..b5801017
--- /dev/null
+++ b/functions/pip/_pip
@@ -0,0 +1,46 @@
+#compdef pip
+#autoload
+
+# pip zsh completion, based on homebrew completion
+
+_pip_installed() {
+ installed_pkgs=(`pip freeze`)
+}
+
+local -a _1st_arguments
+_1st_arguments=(
+ 'bundle:Create pybundles (archives containing multiple packages)'
+ 'freeze:Output all currently installed packages (exact versions) to stdout'
+ 'help:Show available commands'
+ 'install:Install packages'
+ 'search:Search PyPI'
+ 'uninstall:Uninstall packages'
+ 'unzip:Unzip individual packages'
+ 'zip:Zip individual packages'
+)
+
+local expl
+local -a pkgs installed_pkgs
+
+_arguments \
+ '(--version)--version[Show version number of program and exit]' \
+ '(-v --verbose)'{-v,--verbose}'[Give more output]' \
+ '(-q --quiet)'{-q,--quiet}'[Give less output]' \
+ '(-h --help)'{-h,--help}'[Show help]' \
+ '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+ _describe -t commands "pip subcommand" _1st_arguments
+ return
+fi
+
+case "$words[1]" in
+ list)
+ if [[ "$state" == forms ]]; then
+ _pip_installed
+ _requested installed_pkgs expl 'installed packages' compadd -a installed_pkgs
+ fi ;;
+ uninstall)
+ _pip_installed
+ _wanted installed_pkgs expl 'installed packages' compadd -a installed_pkgs ;;
+esac
diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh
index 162eb644..a3054096 100644
--- a/plugins/brew/brew.plugin.zsh
+++ b/plugins/brew/brew.plugin.zsh
@@ -1,67 +1,4 @@
-#compdef brew
-
-# imported from the latest homebrew contributions
-
-_brew_all_formulae() {
- formulae=(`brew search`)
-}
-
-_brew_installed_formulae() {
- installed_formulae=(`brew list`)
-}
-
-local -a _1st_arguments
-_1st_arguments=(
- 'cat:display formula file for a formula'
- 'cleanup:uninstall unused and old versions of packages'
- 'create:create a new formula'
- 'deps:list dependencies and dependants of a formula'
- 'doctor:audits your installation for common issues'
- 'edit:edit a formula'
- 'home:visit the homepage of a formula or the brew project'
- 'info:information about a formula'
- 'install:install a formula'
- 'link:link a formula'
- 'list:list files in a formula or not-installed formulae'
- 'log:git commit log for a formula'
- 'outdated:list formulas for which a newer version is available'
- 'prune:remove dead links'
- 'remove:remove a formula'
- 'search:search for a formula (/regex/ or string)'
- 'unlink:unlink a formula'
- 'update:freshen up links'
- 'uses:show formulas which depend on a formula'
-)
-
-local expl
-local -a formula installed_formulae
-
-_arguments \
- '(-v --verbose)'{-v,--verbose}'[verbose]' \
- '(--version)--version[version information]' \
- '(--prefix)--prefix[where brew lives on this system]' \
- '(--cache)--cache[brew cache]' \
- '*:: :->subcmds' && return 0
-
-if (( CURRENT == 1 )); then
- _describe -t commands "brew subcommand" _1st_arguments
- return
-fi
-
-case "$words[1]" in
- list)
- _arguments \
- '(--unbrewed)--unbrewed[files in brew --prefix not controlled by brew]' \
- '1: :->forms' && return 0
-
- if [[ "$state" == forms ]]; then
- _brew_installed_formulae
- _requested installed_formulae expl 'installed formulae' compadd -a installed_formulae
- fi ;;
- install|home|log|info|uses|cat|deps)
- _brew_all_formulae
- _wanted formulae expl 'all formulae' compadd -a formulae ;;
- remove|edit|xo)
- _brew_installed_formulae
- _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae ;;
-esac
+# add brew completion function to path
+fpath=($ZSH/functions/brew $fpath)
+autoload -U compinit
+compinit -i
diff --git a/plugins/gem.plugin.zsh b/plugins/gem.plugin.zsh
new file mode 100644
index 00000000..0b6ef3c8
--- /dev/null
+++ b/plugins/gem.plugin.zsh
@@ -0,0 +1,4 @@
+# add brew completion function to path
+fpath=($ZSH/functions/gem $fpath)
+autoload -U compinit
+compinit -i
diff --git a/plugins/pip.plugin.zsh b/plugins/pip.plugin.zsh
new file mode 100644
index 00000000..69e21f8d
--- /dev/null
+++ b/plugins/pip.plugin.zsh
@@ -0,0 +1,4 @@
+# add brew completion function to path
+fpath=($ZSH/functions/pip $fpath)
+autoload -U compinit
+compinit -i