diff --git a/bin/cd-improved b/bin/cd-improved
index 67a8e99..1aea9c2 100644
--- a/bin/cd-improved
+++ b/bin/cd-improved
@@ -17,5 +17,4 @@ else
   fi
 fi
 
-git rev-parse --show-toplevel >/dev/null 2>&1 \
-  && prompt gitlong || prompt normal
+source smartprompt
diff --git a/bin/smartprompt b/bin/smartprompt
new file mode 100755
index 0000000..7caee65
--- /dev/null
+++ b/bin/smartprompt
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+git rev-parse --show-toplevel >/dev/null 2>&1 && prompt gitlong || prompt normal