diff --git a/bin/cdist b/bin/cdist
index ac863e9e..aee96e6e 100755
--- a/bin/cdist
+++ b/bin/cdist
@@ -115,10 +115,14 @@ def configinstall(args, mode):
     time_start = time.time()
 
     for host in args.host:
-        c = mode(host,
-                initial_manifest=args.manifest,
-                base_path=args.cdist_home,
-                debug=args.debug)
+        context = cdist.context.Context(
+            target_host=host,
+            initial_manifest=args.manifest,
+            base_path=args.cdist_home,
+            exec_path=sys.argv[0],
+            debug=args.debug)
+
+        c = mode(context)
         if args.parallel:
             log.debug("Creating child process for %s", host)
             process[host] = multiprocessing.Process(target=c.deploy_and_cleanup)