diff --git a/bash/bashrc b/bash/bashrc
index 925f9067..aee177cd 100644
--- a/bash/bashrc
+++ b/bash/bashrc
@@ -188,6 +188,9 @@ source_if_exists /usr/bin/bash_command_timer.sh
 # Auto-launch ssh-agent on login
 source_if_exists "${DOTFILES}/bash/ssh-agent"
 
+# Source commacd: https://github.com/shyiko/commacd
+source_if_exists /usr/bin/commacd.sh
+
 # Unset locally defined function
 unset -f source_if_exists
 
diff --git a/scripts/bootstrap b/scripts/bootstrap
index 1ea94e94..a215d88f 100644
--- a/scripts/bootstrap
+++ b/scripts/bootstrap
@@ -428,12 +428,16 @@ npm install --force --global md-to-pdf@latest
 log_task "Installing doctoc ..."
 npm install --force --global doctoc@latest
 
-log_task "Install doq - a requirement of vim-pydocstring ..."
+log_task "Installing doq - a requirement of vim-pydocstring ..."
 cd "${DOTVIM}"/pack/syntax/start/pydocstring
 make install
 
-log_task "Remove any changes made to bashrc during installation ..."
+log_task "Removing any changes made to bashrc during installation ..."
 git -C "${DOTFILES}" checkout .
 
+log_task "Installing commacd ..."
+sudo wget -P /usr/bin \
+  https://raw.githubusercontent.com/shyiko/commacd/master/commacd.sh
+
 end="$(date +%s)"
 log_task "Finish installation, taking $((end-start)) seconds."