diff --git a/bin/cdist-explorer-run b/bin/cdist-explorer-run
index 23f8a6eb..8ed3c791 100755
--- a/bin/cdist-explorer-run
+++ b/bin/cdist-explorer-run
@@ -24,8 +24,8 @@
 
 
 . cdist-config
-if [ $# -ne 5 ]; then
-   __cdist_usage "<target host> <local srcdir> <local dstdir> <remote srcdir> <remote dstdir>"
+if [ $# -lt 5 ]; then
+   __cdist_usage "<target host> <local srcdir> <local dstdir> <remote srcdir> <remote dstdir> [explorer args]"
 fi
 set -ue
 
@@ -36,10 +36,6 @@ __cdist_local_dst_dir="$1"; shift
 __cdist_remote_src_dir="$1"; shift
 __cdist_remote_dst_dir="$1"; shift
 
-################################################################################
-# New code
-#
-
 # Create remote source and destination directory
 ssh "${__cdist_remote_user}@${__cdist_target_host}"   \
       "mkdir -p   \"${__cdist_remote_src_dir}\"       \
@@ -65,7 +61,7 @@ for explorer in *; do
    # Execute explorers and save results in remote destination directory
    ssh "${__cdist_remote_user}@${__cdist_target_host}" \
        "cd \"${__cdist_remote_src_dir}\" && \"./$explorer\" > \
-       \"${__cdist_remote_dst_dir}/${explorer}\""
+       \"${__cdist_remote_dst_dir}/${explorer}\"" "$@"
 done
 
 # Copy results back to us