diff --git a/bin/cdist-deploy-to b/bin/cdist-deploy-to
index cdc94f20..e369c4e8 100755
--- a/bin/cdist-deploy-to
+++ b/bin/cdist-deploy-to
@@ -1,4 +1,4 @@
-#!/bin/sh
+!/bin/sh
 #
 # 2010 Nico Schottelius (nico-cdist at schottelius.org)
 #
@@ -31,5 +31,5 @@ set -e
 export __cdist_intern_target_host="$1"
 export __cdist_intern_deploy_host="$(cdist_explore_hostname)"
 
-. cdist-build
-. cdist-remote-exec
+. cdist-build "$__cdist_intern_target_host"
+. cdist-remote-exec "$__cdist_intern_target_host"