diff --git a/bin/cdist b/bin/cdist
index 5c1239fb..5a6ce92f 100755
--- a/bin/cdist
+++ b/bin/cdist
@@ -22,5 +22,8 @@
 
 # Wrapper for real script to allow execution from checkout
 dir=${0%/*}
+
+# Ensure version is present - the bundled/shipped version contains a static version,
+# the git version contains a dynamic version
 "$dir/../build" version
-"$dir/../cdist.py" "$@"
+PYTHONPATH="${dir}/../" "$dir/../scripts/cdist" "$@"
diff --git a/cdist.py b/scripts/cdist
similarity index 100%
rename from cdist.py
rename to scripts/cdist