diff --git a/.gitmodules b/.gitmodules
index 5bb3504..8291fae 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "lib/dasht"]
 	path = lib/dasht
 	url = https://github.com/sunaku/dasht
+[submodule "lib/crash"]
+	path = lib/crash
+	url = https://github.com/molovo/crash
diff --git a/lib/crash b/lib/crash
new file mode 160000
index 0000000..e5dc42d
--- /dev/null
+++ b/lib/crash
@@ -0,0 +1 @@
+Subproject commit e5dc42d708c0a659db6a3100f99340b63df19c9b
diff --git a/zsh/zshrc b/zsh/zshrc
index 35bd1d1..c5c654c 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -49,4 +49,7 @@ done
 eval `dircolors ${HOME}/dotfiles/zsh/dircolors`
 
 # Completions Path
-fpath=(${HOME}/dotfiles/lib/completions/src $fpath)
+fpath=(${HOME}/dotfiles/lib/completions/src ${HOME}/dotfiles/lib/crash $fpath)
+
+# Register Crash
+autoload -Uz crash && crash register