diff --git a/bin/cdist-mass-deploy b/bin/cdist-mass-deploy
index dab5d9a5..3adb166c 100755
--- a/bin/cdist-mass-deploy
+++ b/bin/cdist-mass-deploy
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 2010-2011 Nico Schottelius (nico-cdist at schottelius.org)
+# 2011 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@@ -18,39 +18,14 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 #
-# Deploy configuration to a host
+# Deploy configuration to many hosts
 #
 
 . cdist-config
-[ $# -eq 1 ] || __cdist_usage "<target host>"
+[ $# -lt 1 ] || __cdist_usage "<target host> [target host ...]"
 set -eu
 
-__cdist_target_host="$1"
-
-# Make target host available for non-core
-export $__cdist_name_var_target_host="$__cdist_target_host"
-export $__cdist_name_var_target_user="$__cdist_remote_user"
-
-# Export variables for core, which others do not reset
-export __cdist_local_base_dir
-
-echo "cdist $__cdist_version: Configuring $__cdist_target_host"
-
-################################################################################
-# See cdist-stages(7)
-#
-
-# Prepare local and remote directories
-__cdist_init_deploy           "$__cdist_target_host"
-
-# Transfer cdist executables
-echo "Transferring cdist binaries to $__cdist_target_host ..."
-cdist-dir push                "$__cdist_target_host" \
-   "${__cdist_abs_mydir}" "${__cdist_remote_bin_dir}"
-cdist-explorer-run-global     "$__cdist_target_host"
-cdist-manifest-run-init       "$__cdist_target_host"
-cdist-object-all              "$__cdist_target_host" cdist-object-prepare
-cdist-object-all              "$__cdist_target_host" cdist-object-run
-cdist-cache                   "$__cdist_target_host"
-
-echo "cdist $__cdist_version: Successfully finished run on $__cdist_target_host"
+while [ $# -ge 1 ]; do
+   cdist-deploy-to "$1"
+   shift
+done