diff --git a/bin/cdist-config b/bin/cdist-config
index ac94efa7..45792200 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -46,6 +46,8 @@ __cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname"
 : ${__cdist_name_conf_dir:=conf}
 : ${__cdist_name_explorer:=explorer}
 : ${__cdist_name_gencode:=gencode}
+: ${__cdist_name_gencode_local:=$__cdist_name_gencode-local}
+: ${__cdist_name_gencode_remote:=$__cdist_name_gencode-remote}
 : ${__cdist_name_global:=global}
 : ${__cdist_name_host:=host}
 : ${__cdist_name_init:=init}
diff --git a/bin/cdist-object-gencode b/bin/cdist-object-gencode
index aea1da07..61f85a4d 100755
--- a/bin/cdist-object-gencode
+++ b/bin/cdist-object-gencode
@@ -23,11 +23,12 @@
 #
 
 . cdist-config
-[ $# -eq 2 ] || __cdist_usage "<target host>" "<object>"
+[ $# -eq 2 ] || __cdist_usage "<target host>" "<object>" "<remote|local>"
 set -eu
 
 __cdist_target_host="$1"; shift
 __cdist_object="$1"; shift
+__cdist_gencode_type="$1"; shift
 
 __cdist_object_dir="$(__cdist_object_dir "$__cdist_object")"
 __cdist_type="$(__cdist_type_from_object "$__cdist_object")"
diff --git a/bin/cdist-object-gencode-all b/bin/cdist-object-gencode-all
index 90090c8a..3edfe4cc 100755
--- a/bin/cdist-object-gencode-all
+++ b/bin/cdist-object-gencode-all
@@ -31,7 +31,7 @@ __cdist_object_list "$__cdist_out_object_dir" > "$__cdist_tmp_file"
 
 while read object; do
    code="$(__cdist_object_code "$object")"
-   echo "Generating  code  for $object ..."
+   echo "Generating local code for $object ..."
 
    cdist-object-gencode "$__cdist_target_host" "$object" > "${code}"