diff --git a/crab/crab-env.sh.file b/crab/crab-env.sh.file
index f347b9f15cf..be0ea94678e 100644
--- a/crab/crab-env.sh.file
+++ b/crab/crab-env.sh.file
@@ -1,11 +1,15 @@
 #!/bin/bash
-#CMSDIST_FILE_REVISION=1
+#CMSDIST_FILE_REVISION=2
 cms_basedir="@CMS_PATH@/share/cms"
 crab_shared_dir="${cms_basedir}/crab/@CRAB_COMMON_VERSION@"
 for crab_latest in $(ls ${crab_shared_dir}/etc/crab-*.latest 2>/dev/null) ; do
   crab_type=$(basename ${crab_latest} | sed 's|.latest$||;s|^crab-||')
   crab_version=$(cat ${crab_latest})
   if [ -e ${cms_basedir}/crab-${crab_type}/${crab_version}/etc/crab-bash-completion.sh ]; then
+    if [ $(ps -p$$ -ocmd=) = "zsh" ] ; then
+      autoload -U +X compinit && compinit
+      autoload -U +X bashcompinit && bashcompinit
+    fi
     source ${cms_basedir}/crab-${crab_type}/${crab_version}/etc/crab-bash-completion.sh >/dev/null 2>&1
   fi
   unset crab_version crab_type
diff --git a/crab/crab-setup.sh.file b/crab/crab-setup.sh.file
index fe359d2a5ae..37d03357b5c 100644
--- a/crab/crab-setup.sh.file
+++ b/crab/crab-setup.sh.file
@@ -1,5 +1,5 @@
 #!/bin/bash
-#CMSDIST_FILE_REVISION=1
+#CMSDIST_FILE_REVISION=2
 case "X$1Y" in
   XprodY|XdevY|XpreY) CRABCLIENT_TYPE="$1" ;;
   XY ) CRABCLIENT_TYPE="prod" ;;
@@ -12,5 +12,9 @@ esac
 export CRABCLIENT_TYPE
 crab_shared_dir="@CMS_PATH@/share/cms/crab/@CRAB_COMMON_VERSION@"
 export PYTHONPATH="${crab_shared_dir}/lib/${CRABCLIENT_TYPE}${PYTHONPATH:+:$PYTHONPATH}"
+if [ $(ps -p$$ -ocmd=) = "zsh" ] ; then
+  autoload -U +X compinit && compinit
+  autoload -U +X bashcompinit && bashcompinit
+fi
 complete -F _UseCrab_${CRABCLIENT_TYPE} -o filenames crab
 unset crab_shared_dir