diff --git a/Makefile b/Makefile
index 8eb3edb..95b9076 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,9 @@ install:
 	hg clone git://github.com/nicoulaj/zsh-syntax-highlighting.git
 	hg clone git://github.com/robbyrussell/oh-my-zsh.git
 	hg clone git://fizsh.git.sourceforge.net/gitroot/fizsh/fizsh
+	mkdir -p $(PWD)/functions.d
+	cp -f $(PWD)/autojump/_j $(PWD)/functions.d/_j
+	sudo ln -sf $(PWD)/autojump/autojump /usr/bin/autojump
 
 clean: 
 	rm -r ./autojump
diff --git a/completion.zsh b/completion.zsh
index e25805b..6ed9db9 100644
--- a/completion.zsh
+++ b/completion.zsh
@@ -4,6 +4,9 @@
 # tab completion configuration
 #
 
+fpath=( ~/.zsh/functions.d/ $fpath )
+autoload -U ~/.zsh/functions.d/*(:t)
+
 # load completions system
 zmodload -i zsh/complist