diff --git a/bin/cdist-manifest-run b/bin/cdist-manifest-run
index d5b64a58..28123afa 100755
--- a/bin/cdist-manifest-run
+++ b/bin/cdist-manifest-run
@@ -31,7 +31,7 @@ fi
 set -aeu
 
 __cdist_output_dir="$1"; shift
-__cdist_manifest="$1"; shift
+export __cdist_manifest="$1"; shift
 
 # Ensure binaries exist and are up-to-date
 cdist-build-bin
diff --git a/bin/cdist_tree_wrapper b/bin/cdist_tree_wrapper
index 69835716..69da096d 100755
--- a/bin/cdist_tree_wrapper
+++ b/bin/cdist_tree_wrapper
@@ -46,6 +46,9 @@ fi
 
 mkdir -p "${__cdist_ddir}"
 
+# Record (correct ;-) source
+echo "${__cdist_manifest}" > "${__cdist_ddir}/${__cdist_object_source}"
+
 while [ $# -gt 0 ]; do
    opt="$1"; shift
 
@@ -62,6 +65,4 @@ while [ $# -gt 0 ]; do
 
    echo "${value}" > "${__cdist_ddir}/${opt_file}"
 
-   echo "${__cdist_abs_myname}" > "${__cdist_ddir}/${__cdist_object_source}"
-
 done