diff --git a/bin/cdist-manifest-run b/bin/cdist-manifest-run
deleted file mode 100755
index d4ea18bb..00000000
--- a/bin/cdist-manifest-run
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-#
-# 2010 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-# 
-# Let's build a cconfig tree from a configuration
-# And save it into the cache tree
-#
-
-. cdist-config
-[ $# -eq 2 ] || __cdist_usage "<target host> <manifest>"
-set -u
-
-__cdist_target_host="$1"; shift
-__cdist_manifest="$1"; shift
-
-################################################################################
-# Export information for cdist-type-emulator or manifest
-#
-
-# Config dir should not get reset - FIXME: why did I do this?
-export __cdist_conf_dir
-
-# Used to record the source in the object
-export __cdist_manifest
-
-# Export information for manifests - __cdist_out_dir comes from cdist-config
-export __global="$__cdist_out_dir"
-
-################################################################################
-# The actual run
-#
-
-# Ensure binaries exist and are up-to-date
-cdist-type-build-emulation "${__cdist_out_type_bin_dir}" \
-   || __cdist_exit_err "Failed to build type emulation binaries"
-
-# prepend our path, so all cdist tools come before other tools
-export PATH="${__cdist_out_type_bin_dir}:$PATH"
-
-__cdist_exec_fail_on_error "${__cdist_manifest}"
diff --git a/bin/cdist-manifest-run-init b/bin/cdist-manifest-run-init
index 28acc623..787d2315 100755
--- a/bin/cdist-manifest-run-init
+++ b/bin/cdist-manifest-run-init
@@ -31,4 +31,4 @@ __cdist_target_host="$1"; shift
 eval export $__cdist_name_var_manifest=\"\$__cdist_manifest_dir\"
 
 __cdist_echo info "Running initial manifest for $__cdist_target_host "
-cdist-manifest-run "$__cdist_target_host" "$__cdist_manifest_init"
+__cdist_manifest_run "$__cdist_manifest_init"
diff --git a/core/__cdist_manifest_run b/core/__cdist_manifest_run
new file mode 100755
index 00000000..f2283f85
--- /dev/null
+++ b/core/__cdist_manifest_run
@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+# 2010 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+# 
+# Let's build a cconfig tree from a configuration
+# And save it into the cache tree
+#
+
+__cdist_manifest_run()
+{
+
+   [ $# -eq 1 ] || __cdist_usage "<manifest>"
+   set -u
+
+   __cdist_manifest="$1"; shift
+
+   ################################################################################
+   # Export information for cdist-type-emulator or manifest
+   #
+
+   # Config dir should not get reset - FIXME: why did I do this?
+   export __cdist_conf_dir
+
+   # Used to record the source in the object
+   export __cdist_manifest
+
+   # Export information for manifests - __cdist_out_dir comes from cdist-config
+   export __global="$__cdist_out_dir"
+
+   ################################################################################
+   # The actual run
+   #
+
+   # Ensure binaries exist and are up-to-date
+   cdist-type-build-emulation "${__cdist_out_type_bin_dir}" \
+      || __cdist_exit_err "Failed to build type emulation binaries"
+
+   # prepend our path, so all cdist tools come before other tools
+   export PATH="${__cdist_out_type_bin_dir}:$PATH"
+
+   __cdist_exec_fail_on_error "${__cdist_manifest}"
+}
diff --git a/core/__cdist_object_manifest_run b/core/__cdist_object_manifest_run
index 630d5d8b..40413726 100755
--- a/core/__cdist_object_manifest_run
+++ b/core/__cdist_object_manifest_run
@@ -48,7 +48,7 @@ __cdist_object_manifest_run()
          export $__cdist_name_var_object_id="$__cdist_object_id"
          export $__cdist_name_var_type="$(__cdist_type_dir "$__cdist_type")"
 
-         cdist-manifest-run "$__cdist_target_host" "$__cdist_manifest"
+         __cdist_manifest_run "$__cdist_target_host" "$__cdist_manifest"
 
          # Tell cdist-object-run-all that there may be new objects
          touch "$__cdist_objects_created"