diff --git a/.gitignore b/.gitignore
index 97ba8b9..9775db9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,4 @@
 *.rej
 dmenu
 config.h
-dmenu_path
-dmenu_run
 stest
diff --git a/dmenu_path b/dmenu_path
new file mode 100755
index 0000000..3a7cda7
--- /dev/null
+++ b/dmenu_path
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+cachedir="${XDG_CACHE_HOME:-"$HOME/.cache"}"
+cache="$cachedir/dmenu_run"
+
+[ ! -e "$cachedir" ] && mkdir -p "$cachedir"
+
+IFS=:
+if stest -dqr -n "$cache" $PATH; then
+	stest -flx $PATH | sort -u | tee "$cache"
+else
+	cat "$cache"
+fi
diff --git a/dmenu_run b/dmenu_run
new file mode 100755
index 0000000..834ede5
--- /dev/null
+++ b/dmenu_run
@@ -0,0 +1,2 @@
+#!/bin/sh
+dmenu_path | dmenu "$@" | ${SHELL:-"/bin/sh"} &