diff --git a/HACKERS_README b/HACKERS_README
index cebe981c..a5b1d23a 100755
--- a/HACKERS_README
+++ b/HACKERS_README
@@ -36,7 +36,7 @@ cdist-manifest-init localhost "$object_tmp"
 find "$object_tmp"
 
 # Generate all objects, including from types that generate objects as well
-cdist-manifest-recursive-all localhost "$object_tmp"
+cdist-manifest-run-all localhost "$object_tmp"
 
 # See what it generated
 find "$object_tmp"
diff --git a/bin/cdist-manifest-run-all b/bin/cdist-manifest-run-all
index bda276f5..08916a23 100755
--- a/bin/cdist-manifest-run-all
+++ b/bin/cdist-manifest-run-all
@@ -28,11 +28,7 @@
 #
 
 . cdist-config
-
-if [ $# -ne 2 ]; then
-   __cdist_usage "<target host> <object_base_dir>"
-fi
-
+[ $# -eq 2 ] || __cdist_usage "<target host> <object_base_dir>"
 set -eu
 
 __cdist_target_host="$1"; shift
@@ -89,11 +85,12 @@ while [ "$no_new_object" = "n"  ]; do
                # Source of the new object
                new_object_dir="${newobjects}/$newobject"
 
-               echo "MIGRATING: $newobject"
                find $new_object_dir
 
                mkdir -p "$object_dir"
+               # Move parameters and source information
                mv "${new_object_dir}/"* "$object_dir"
+               mv "${new_object_dir}/${__cdist_name_object_source}" "$object_dir"
                set +x
             done < "$newobjectlist"