diff --git a/bashrc.d/asdf.bash b/bashrc.d/asdf.bash
index 063e4eb..8548f2c 100644
--- a/bashrc.d/asdf.bash
+++ b/bashrc.d/asdf.bash
@@ -1,4 +1,11 @@
 if [ -d "$HOME/.asdf" ] ; then
-  . "$HOME/.asdf/asdf.sh"
-  . "$HOME/.asdf/completions/asdf.bash"
+  ASDF_DATA_DIR=$HOME/.asdf
+
+  # Pre-0.16.0
+  # if [ -f "$ASDF_DATA_DIR/asdf.sh" ] ; then
+    # . "$HOME/.asdf/asdf.sh"
+    # . "$HOME/.asdf/completions/asdf.bash"
+  # fi
+
+  addpath $ASDF_DATA_DIR/shims
 fi