diff --git a/bin/cdist-object-gencode-run b/bin/cdist-object-gencode-run
new file mode 100755
index 00000000..76ce6953
--- /dev/null
+++ b/bin/cdist-object-gencode-run
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# 2010 Nico Schottelius (nico-cdist at schottelius.org)
+# 2011 Steven Armstrong (steven-cdist at armstrong.cc)
+#
+# 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/>.
+#
+# 
+# For the given object create the code to be executed on the target.
+#
+
+. cdist-config
+[ $# -eq 2 ] || __cdist_usage "<target host> <object>"
+set -eu
+
+__cdist_target_host="$1"; shift
+__cdist_object="$1"; shift
+
+code_local="$(__cdist_object_code "$__cdist_object")-${__cdist_name_gencode_local}"
+code_remote="$(__cdist_object_code "$__cdist_object")-${__cdist_name_gencode_remote}"
+
+echo "Generating local code for $__cdist_object ..."
+cdist-object-gencode "$__cdist_target_host" "$__cdist_object" \
+   "${__cdist_name_gencode_local}" > "${code_local}"
+
+echo "Generating remote code for $__cdist_object ..."
+cdist-object-gencode "$__cdist_target_host" "$__cdist_object" \
+   "${__cdist_name_gencode_remote}" > "${code_remote}"
+
+chmod u+x "${code_local}" "${code_remote}"
+