diff --git a/cmake/toolchain/heptools-84swan1.cmake b/cmake/toolchain/heptools-84swan1.cmake
index 18d15f3e37384e18dc1f17e18029bf600a6970b8..a7648ec05e6f9dd30dd1f221186887e2e9154375 100644
--- a/cmake/toolchain/heptools-84swan1.cmake
+++ b/cmake/toolchain/heptools-84swan1.cmake
@@ -97,6 +97,7 @@ LCG_external_package(processing        0.52
 LCG_external_package(ptyprocess        0.4                                      )
 LCG_external_package(py                1.4.8                                    )
 LCG_external_package(py2neo            1.4.6                                    )
+LCG_external_package(py4j              0.9                                    )
 LCG_external_package(pyanalysis        1.5                                      )
 LCG_external_package(pydot             1.0.28                                   )
 LCG_external_package(pygments          2.0.2                                   )
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index f1c2b4938758db6b413bffa3e69d5572fb124810..d190c73947553b1cb6db4a16411f4dbe7c951965 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -571,8 +571,9 @@ LCGPackage_Add(
   BUILD_COMMAND <VOID>
   INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/dist <INSTALL_DIR>
           COMMAND ${CMAKE_COMMAND} -E make_directory <INSTALL_DIR>/lib/python2.7/site-packages
-	  COMMAND ${CMAKE_COMMAND} -E copy <INSTALL_DIR>/python/lib/py4j-0.9-src.zip <INSTALL_DIR>/lib/python2.7/site-packages/.
+#	  COMMAND ${CMAKE_COMMAND} -E copy <INSTALL_DIR>/python/lib/py4j-0.9-src.zip <INSTALL_DIR>/lib/python2.7/site-packages/.
 	  COMMAND ${CMAKE_COMMAND} -E copy <INSTALL_DIR>/python/lib/pyspark.zip  <INSTALL_DIR>/lib/python2.7/site-packages/. 
+	  COMMAND ${CMAKE_COMMAND} -E unzip <INSTALL_DIR>/lib/python2.7/site-packages/pyspark.zip 
   BUILD_IN_SOURCE 1
 )
 
diff --git a/pyexternals/CMakeLists.txt b/pyexternals/CMakeLists.txt
index 9479ebbb4e4af6b085e166ea6303c66dad0a3431..92e272a372d919a3e2b26c518ab1e771c862f8bf 100644
--- a/pyexternals/CMakeLists.txt
+++ b/pyexternals/CMakeLists.txt
@@ -641,7 +641,7 @@ LCGPackage_Add(
 #---py4j------------------------------------------------------------------------------------------------------
 LCGPackage_Add(
   py4j
-  URL http://service-spi.web.cern.ch/service-spi/external/tarFiles/py4j-${py4j_native_version}.zip
+  URL http://service-spi.web.cern.ch/service-spi/external/tarFiles/py4j-${py4j_native_version}-src.zip
   CONFIGURE_COMMAND <VOID>
   BUILD_COMMAND ${Python_cmd} setup.py build
   INSTALL_COMMAND ${Lock_cmd}