diff --git a/bin/cdist-manifest-run b/bin/cdist-manifest-run
index 38cf9f1b..5d617444 100755
--- a/bin/cdist-manifest-run
+++ b/bin/cdist-manifest-run
@@ -23,7 +23,7 @@
 #
 
 . cdist-config
-[ $# -eq 3 ] || __cdist_usage "<target host> <manifest> <outdir>"
+[ $# -ge 3 ] || __cdist_usage "<target host> <manifest> <outdir> [manifest arguments]"
 set -u
 
 export __cdist_target_host="$1"; shift
@@ -43,4 +43,4 @@ fi
 
 mkdir -p "${__cdist_output_dir}" || __cdist_exit_err "Cannot create output dir ${__cdist_output_dir}"
 
-__cdist_exec_fail_on_error "${__cdist_manifest}"
+__cdist_exec_fail_on_error "${__cdist_manifest}" "$@"