diff --git a/cmake/toolchain/heptools-dev-base.cmake b/cmake/toolchain/heptools-dev-base.cmake
index 89e18a987f7cc22de0b0dfa3ac832f516a5f1955..afec9aaf5e04d9afba68d5560ab905c0547a2ae1 100644
--- a/cmake/toolchain/heptools-dev-base.cmake
+++ b/cmake/toolchain/heptools-dev-base.cmake
@@ -13,6 +13,7 @@ if(LCG_PYTHON_VERSION EQUAL 3)
   LCG_external_package(astroid           2.3.3                                    )
   LCG_external_package(bcrypt            3.1.6                                    )
   LCG_external_package(control           0.8.2                                    )
+  LCG_external_package(docopt            0.6.2                                    )
   LCG_external_package(hepdata_converter 0.2.3                                    )
   LCG_external_package(hypothesis        5.3.0                                    )
   LCG_external_package(ipython           7.5.0                                    )
@@ -52,6 +53,7 @@ if(LCG_PYTHON_VERSION EQUAL 3)
   LCG_external_package(jupyterlab_server 1.0.6                                    )
   LCG_external_package(scikitlearn       0.21.2                                   )
   LCG_external_package(scipy             1.5.1                                    )
+  LCG_external_package(stomppy           6.1.0                                    )
   LCG_External_package(more_itertools    7.0.0                                    )  
   LCG_External_package(upandas           0.2.0                                    )
   LCG_external_package(numpy             1.18.2                                   )
@@ -91,6 +93,7 @@ else()
   LCG_external_package(jupyter_console   5.2.0                                    )
   LCG_external_package(scikitlearn       0.20.3                                   )
   LCG_external_package(scipy             1.2.2                                    )
+  LCG_external_package(stomppy           3.1.3                                    )
   LCG_External_package(more_itertools    5.0.0                                    )
   if(NOT ${LCG_OS}${LCG_OSVERS} MATCHES ubuntu18|mac[0-9]+)
     LCG_external_package(pygsi           0.6.3                                    )
@@ -547,7 +550,6 @@ LCG_external_package(spdlog            1.5.0
 LCG_external_package(sqlalchemy        1.2.10                                   )
 LCG_external_package(sqlite            3320300                                  )
 LCG_external_package(statsmodels       0.10.2                                   )
-LCG_external_package(stomppy           3.1.3                                    )
 LCG_external_package(storm             0.23                                     )
 LCG_external_package(swig              4.0.2                                    )
 LCG_external_package(sympy             1.4                                      )
diff --git a/pyexternals/CMakeLists.txt b/pyexternals/CMakeLists.txt
index 511bc29338b5d7e36a4b9ed5f2f6cde44be4b5d9..fde10a37e25dc82abe6631f3ef4fe638368896d3 100644
--- a/pyexternals/CMakeLists.txt
+++ b/pyexternals/CMakeLists.txt
@@ -1532,6 +1532,19 @@ LCGPackage_Add(
   DEPENDS Python setuptools
 )
 
+#---docopt------------------------------------------------------------------------------------------------------
+LCGPackage_Add(
+  docopt
+  URL ${GenURL}/docopt-${docopt_native_version}.tar.gz
+  CONFIGURE_COMMAND <VOID>
+  BUILD_COMMAND <VOID>
+  INSTALL_COMMAND ${MakeSitePackagesDir}
+          COMMAND ${PYTHON} setup.py install ${PySetupOptions}
+          COMMAND ${CMAKE_SOURCE_DIR}/pyexternals/Python_postinstall.sh <INSTALL_DIR>
+  BUILD_IN_SOURCE 1
+  DEPENDS Python setuptools
+)
+
 #---stomppy------------------------------------------------------------------------------------------------------
 LCGPackage_Add(
   stomppy