diff --git a/zsh/completion.zsh b/zsh/completion.zsh
index 3865142..dc1cf66 100644
--- a/zsh/completion.zsh
+++ b/zsh/completion.zsh
@@ -5,3 +5,12 @@ zstyle :compinstall filename '/home/nkrishnan/.zshrc'
 
 autoload -Uz compinit
 compinit
+
+#######################################################################
+# ZSH Command suggestions
+#######################################################################
+# This is only valid on Ubuntu, I haven't found a Mac OS equivalent
+if [[ -e /etc/zsh_command_not_found ]]
+then
+    source /etc/zsh_command_not_found
+fi