diff --git a/Tools/PyCmt/CMakeLists.txt b/Tools/PyCmt/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e9dac9272e131d013ca1a6c8643ba4ab64e7a09e
--- /dev/null
+++ b/Tools/PyCmt/CMakeLists.txt
@@ -0,0 +1,17 @@
+################################################################################
+# Package: PyCmt
+################################################################################
+
+# Declare the package name:
+atlas_subdir( PyCmt )
+
+# External dependencies:
+find_package( PythonLibs )
+
+# this line failed automatic conversion in cmt2cmake :
+# cmtpath_pattern_reverse  macro_append includes ' $(ppcmd)"<path>/$(cmt_installarea_prefix)/$(CMTCONFIG)/include" '
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py python/pyshell python/pkgbuild )
+atlas_install_scripts( bin/make_pkgbuild.py )
+
diff --git a/Tools/PyCmt/python/Cmt.py b/Tools/PyCmt/python/Cmt.py
index 25fb6f9f674f3789b66bf33b518d8ca6eccf450a..8d16fd8051ff1d6d764dfc8b2bb35706858aa4d8 100755
--- a/Tools/PyCmt/python/Cmt.py
+++ b/Tools/PyCmt/python/Cmt.py
@@ -39,6 +39,8 @@ class CmtOptions(object):
         "AtlasHLT",
         "AtlasOffline",
         "AtlasProduction",
+        "AtlasDerivation",
+        "AthAnalysisBase"
         ]
 
     ## number of spaces in the output of the 'cmt show uses' to represent