diff --git a/bin/cdist b/bin/cdist
index 5a6ce92f..dfe4fa00 100755
--- a/bin/cdist
+++ b/bin/cdist
@@ -26,4 +26,8 @@ dir=${0%/*}
 # Ensure version is present - the bundled/shipped version contains a static version,
 # the git version contains a dynamic version
 "$dir/../build" version
-PYTHONPATH="${dir}/../" "$dir/../scripts/cdist" "$@"
+
+libdir=$(cd "${dir}/../" && pwd -P)
+export PYTHONPATH="${libdir}"
+
+"$dir/../scripts/cdist" "$@"
diff --git a/docs/changelog b/docs/changelog
index 9b6a391f..3062d44b 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -6,6 +6,7 @@ Changelog
 
 2.1.0pre6:
 	* New Example: Turn remote calls into local calls (used for unittesting)
+	* Core: Export PYTHONPATH, it's also needed by emulator
 
 2.1.0pre5: 2012-11-01
 	* Core: First round of tests updated to work with multiple configuration directories