diff --git a/Tools/Scripts/CMakeLists.txt b/Tools/Scripts/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..97ca5f0fe92665d72588d32701e237213f56d72a
--- /dev/null
+++ b/Tools/Scripts/CMakeLists.txt
@@ -0,0 +1,16 @@
+################################################################################
+# Package: Scripts
+################################################################################
+
+# Declare the package name:
+atlas_subdir( Scripts )
+
+# this line failed automatic conversion in cmt2cmake :
+# setup_script $(SETUPCOMPLETIONROOT)/cmt/completion/setup_completion_main
+
+# Install files from the package:
+atlas_install_scripts( share/get_joboptions share/get_files share/lookup_local_joboptions.sh share/lookup_joboptions.sh share/lookup_scripts.sh share/lookup_xmls.sh share/lookup_data.sh share/checkDbgSymbols.sh )
+
+athena_env( SET DO_EXT_ATHENA_TAB_COMPLETION 0
+            SET SETUPCOMPLETIONROOT \\\${SCRIPTSROOT} )
+
diff --git a/Tools/Scripts/cmt/completion/setup_completion.bash b/Tools/Scripts/cmt/completion/setup_completion.bash
index 25caa0a63019feade2cf960915e4efdd2742b7bd..20be51e55b06643fada8f60c9bd06698996a2135 100755
--- a/Tools/Scripts/cmt/completion/setup_completion.bash
+++ b/Tools/Scripts/cmt/completion/setup_completion.bash
@@ -94,7 +94,7 @@ if [ "${DO_EXT_ATHENA_TAB_COMPLETION:-}" = 1 ]; then
     complete -C lookup_joboptions.sh -X '!&*' athena athena.py
 else
 #    echo "do only local completion for athena"
-    complete -C lookup_local_joboptions.sh -X '!&*' athena athena.py
+    complete -C lookup_local_joboptions.sh -X '!&*' -o dirnames athena athena.py
 fi
 complete -F f_get_txtjoboptions check_joboptions
 #complete -F f_get_pyjoboptions athena.py
diff --git a/Tools/Scripts/cmt/requirements b/Tools/Scripts/cmt/requirements
index 7a5b2c5c7f4f13dd8e1797b570206ae6ed3f259a..7954c327cb60f2b6f2270d861a0d13b04c619951 100755
--- a/Tools/Scripts/cmt/requirements
+++ b/Tools/Scripts/cmt/requirements
@@ -22,7 +22,6 @@ use AtlasPolicy AtlasPolicy-*
 apply_pattern declare_scripts files="get_joboptions get_files \
   lookup_local_joboptions.sh \
   lookup_joboptions.sh lookup_scripts.sh lookup_xmls.sh lookup_data.sh \
-#  setup_completion.zsh setup_completion.tcsh setup_completion.bash \
    checkDbgSymbols.sh"
 
 # Source the tab completion script for jobOptions and other files
diff --git a/Tools/Scripts/share/checkDbgSymbols.sh b/Tools/Scripts/share/checkDbgSymbols.sh
index 9257325da4490217f6e7e39219f2a270ff176c15..1d9e2b34c2c761f274aa8dae3d8696898e7125af 100755
--- a/Tools/Scripts/share/checkDbgSymbols.sh
+++ b/Tools/Scripts/share/checkDbgSymbols.sh
@@ -13,7 +13,7 @@ fi
 
 # Ignore these libraries (regexp)
 filter='HepMC|libfastjet|libCDFConesPlugin|libSISConePlugin|libsiscone|libulxmlrpcpp|libG4processes|libModelInteractions|libCascade_i|libMCTester_i|
-|libColMan|libATLASConePlugin|libCMSIterativeConePlugin|libD0RunIIConePlugin|libEECambridgePlugin|libJadePlugin|libNestedDefsPlugin|libPxConePlugin|libTrackJetPlugin|libtbb'
+|libColMan|libATLASConePlugin|libCMSIterativeConePlugin|libD0RunIIConePlugin|libEECambridgePlugin|libJadePlugin|libNestedDefsPlugin|libPxConePlugin|libTrackJetPlugin|libtbb|libtcmalloc|libfftw3f|libprofiler|libgmock|libgtest'
 
 ignored=''
 dbglibs=''
diff --git a/Tools/Scripts/share/lookup_local_joboptions.sh b/Tools/Scripts/share/lookup_local_joboptions.sh
index 05e56a69bf8663edde5a2a1bd554cce11b962ba4..a45c96fa24ae2c2a29244df5ef8968a1bf5d9a1c 100755
--- a/Tools/Scripts/share/lookup_local_joboptions.sh
+++ b/Tools/Scripts/share/lookup_local_joboptions.sh
@@ -1,3 +1 @@
-
-f=`pwd`
-if test -d ${f} ; then find ${f} -name '*.py' -o -name '*.pyc' | sed -e 's#'"${f}"'/##'; fi
+find ${2}* -maxdepth 0 -name "*.py" -o -name "*.pyc" 2>/dev/null