diff --git a/ndenv.d/rehash/rehash_npm.bash b/ndenv.d/rehash/rehash_npm.bash
new file mode 100755
index 0000000..fa6ba69
--- /dev/null
+++ b/ndenv.d/rehash/rehash_npm.bash
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -e
+
+NPM_SHIM_PATH="$SHIM_PATH/npm"
+
+command -p cat > "$NPM_SHIM_PATH" <<SH
+#!/usr/bin/env bash
+set -e
+[ -n "\$NDENV_DEBUG" ] && set -x
+
+program="\${0##*/}"
+export NDENV_ROOT="$NDENV_ROOT"
+"$(command -v ndenv)" exec "\$program" "\$@"
+rc=\$?
+for arg in \$W
+do
+  case \$arg in
+    '-h'|'--help'|'-v'|'--version'|'-l')
+      exit \$rc
+    ;;
+  esac
+done
+"$(command -v ndenv)" rehash
+exit \$rc
+SH
+
+command -p chmod +x "$NPM_SHIM_PATH"
diff --git a/ndenv.d/rehash/rehash_yarn.bash b/ndenv.d/rehash/rehash_yarn.bash
new file mode 100755
index 0000000..cf3470a
--- /dev/null
+++ b/ndenv.d/rehash/rehash_yarn.bash
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+set -e
+
+YARN_SHIM_PATH="$SHIM_PATH/yarn"
+
+command -p cat > "$YARN_SHIM_PATH" <<SH
+#!/usr/bin/env bash
+set -e
+[ -n "\$NDENV_DEBUG" ] && set -x
+
+program="\${0##*/}"
+export NDENV_ROOT="$NDENV_ROOT"
+"$(command -v ndenv)" exec "\$program" "\$@"
+rc=\$?
+for arg in \$W
+do
+  case \$arg in
+    '-h'|'--help'|'--version')
+      exit \$rc
+    ;;
+  esac
+done
+"$(command -v ndenv)" rehash
+exit \$rc
+SH
+
+command -p chmod +x "$YARN_SHIM_PATH"