diff --git a/cmake/toolchain/heptools-gen1.cmake b/cmake/toolchain/heptools-gen1.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..a99a14a5011e5f4aed95a85815f04b5d038f9894
--- /dev/null
+++ b/cmake/toolchain/heptools-gen1.cmake
@@ -0,0 +1,190 @@
+cmake_minimum_required(VERSION 2.8.5)
+
+# Declare the version of HEP Tools we use
+# (must be done before including heptools-common to allow evolution of the
+# structure)
+set(heptools_version experimental)
+
+include(${CMAKE_CURRENT_LIST_DIR}/heptools-common.cmake)
+
+# please keep alphabetic order and the structure (tabbing).
+# it makes it much easier to edit/read this file!
+
+
+# Application Area Projects
+#LCG_AA_project(COOL COOL_3_0-preview)
+#LCG_AA_project(CORAL CORAL_3_0-preview)
+LCG_AA_project(COOL 3_0-preview)
+LCG_AA_project(CORAL 3_0-preview)
+LCG_AA_project(RELAX RELAX_1_4_2)
+LCG_AA_project(ROOT v6-02-00-patches)
+LCG_AA_project(LCGCMT LCGCMT_${heptools_version})
+LCG_AA_project(HepMC 2.06.09)
+#LCG_external_package(Geant4 9.6.p03 CLHEP=2.1.4.1)
+
+# Externals
+LCG_external_package(hepmc3 githead )
+LCG_external_package(4suite 1.0.2p1 )
+LCG_external_package(AIDA 3.2.1 )
+LCG_external_package(backports 3.4.0.2 )
+LCG_external_package(blas 20110419 )
+LCG_external_package(Boost 1.55.0 )
+LCG_external_package(certifi 14.05.14 )
+LCG_external_package(CLHEP 2.1.4.1 clhep )
+LCG_external_package(cmaketools 1.1 )
+LCG_external_package(cmt v1r20p20090520 )
+LCG_external_package(coin3d 3.1.3p2 )
+LCG_external_package(coverage 3.5.2 )
+LCG_external_package(CppUnit 1.12.1_p1 author=1.12.1 )
+LCG_external_package(cx_oracle 5.1.1 )
+if(NOT ${LCG_OS} STREQUAL mac)
+ LCG_external_package(Davix 0.3.1 )
+endif()
+LCG_external_package(doxygen 1.8.9.1 )
+LCG_external_package(expat 2.0.1 )
+LCG_external_package(eigen 3.2.4 )
+LCG_external_package(fastjet 3.1.1 )
+LCG_external_package(fftw 3.1.2 fftw3 )
+LCG_external_package(Frontier_Client 2.8.10 frontier_client)
+LCG_external_package(GCCXML 0.9.0_20131026 gccxml )
+LCG_external_package(genshi 0.6 )
+LCG_external_package(gmp 6.0.0 )
+LCG_external_package(gtest 1.7.0 )
+LCG_external_package(graphviz 2.28.0 )
+LCG_external_package(GSL 1.10 )
+LCG_external_package(HepPDT 2.06.01 )
+LCG_external_package(ipython 3.1.0 )
+LCG_external_package(Jinja2 2.7.3 )
+LCG_external_package(json 2.5.2 )
+LCG_external_package(jsonschema 2.4.0 )
+LCG_external_package(lapack 3.5.0 )
+LCG_external_package(lcov 1.9 )
+LCG_external_package(libsvm 2.86 )
+LCG_external_package(libtool 2.4.2 )
+LCG_external_package(lxml 2.3 )
+LCG_external_package(matplotlib 1.3.1 )
+LCG_external_package(messaging 1.0 )
+LCG_external_package(mock 0.8.0 )
+LCG_external_package(multiprocessing 2.6.2.1 )
+LCG_external_package(mysql 5.5.27 )
+LCG_external_package(mysql_python 1.2.3 )
+LCG_external_package(nose 1.1.2 )
+LCG_external_package(numpy 1.9.2 )
+LCG_external_package(oracle 11.2.0.3.0 )
+LCG_external_package(pacparser 1.3.1 )
+LCG_external_package(pcre 8.34 )
+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(pyanalysis 1.5 )
+LCG_external_package(pydot 1.0.28 )
+LCG_external_package(pygraphics 1.5 )
+LCG_external_package(pygsi 0.5 )
+LCG_external_package(pylint 1.4.0 )
+LCG_external_package(pyminuit 0.0.1 )
+LCG_external_package(pyparsing 1.5.6 )
+LCG_external_package(pyqt 4.9.5 )
+LCG_external_package(pytest 2.2.4 )
+LCG_external_package(pytz 2014.7 )
+LCG_external_package(Python 2.7.9 )
+LCG_external_package(PythonFWK 2.7.9 Python )
+LCG_external_package(python_dateutil 2.4.0 )
+LCG_external_package(pytools 1.9 )
+LCG_external_package(pyxml 0.8.4p1 )
+LCG_external_package(pyzmq 14.5.0 )
+LCG_external_package(QMtest 2.4.1 )
+LCG_external_package(Qt 4.8.6 qt )
+LCG_external_package(Qt5 5.4.1 qt5 )
+LCG_external_package(qwt 6.0.1 )
+LCG_external_package(scipy 0.15.1 )
+LCG_external_package(setuptools 0.6c11 )
+LCG_external_package(sip 4.14 )
+LCG_external_package(six 1.9.0 )
+LCG_external_package(soqt 1.5.0 )
+LCG_external_package(sqlalchemy 0.7.7 )
+LCG_external_package(sqlite 3070900 )
+LCG_external_package(stomppy 3.1.3 )
+LCG_external_package(storm 0.19 )
+LCG_external_package(subprocess32 3.2.6 )
+LCG_external_package(swig 2.0.11 author=2.0.11 )
+LCG_external_package(sympy 0.7.1 )
+LCG_external_package(tbb 42_20140122 )
+LCG_external_package(tcmalloc 2.4 )
+LCG_external_package(terminado 0.5 )
+LCG_external_package(tornado 4.0.2 )
+if(NOT ${LCG_OS}${LCG_OSVERS} STREQUAL slc6) # uuid is not distributed with SLC6
+LCG_external_package(uuid 1.42 )
+endif()
+if(NOT ${LCG_OS}${LCG_OSVERS} STREQUAL mac1010 AND NOT LCG_TARGET MATCHES "icc" ) # valgrind does not work yet with mac1010 and icc
+ LCG_external_package(valgrind 3.10.1 )
+endif()
+LCG_external_package(vectorclass 1.16 )
+LCG_external_package(vdt 0.3.6 )
+LCG_external_package(XercesC 3.1.1p1 author=3.1.1 )
+LCG_external_package(xqilla 2.2.4p1 )
+LCG_external_package(xrootd 3.3.6 )
+if(NOT ${LCG_OS} STREQUAL mac)
+ LCG_external_package(xrootd_python 0.1.3 )
+endif()
+
+LCG_external_package(mpich2 1.5 )
+LCG_external_package(ftjam 2.5.2 )
+LCG_external_package(omniorb 4.2.0 )
+
+
+
+#---EMI-2 grid externals and other binary packages---------------------
+if(NOT ${LCG_OS} MATCHES "mac")
+ LCG_external_package(libunwind 5c2cade )
+ LCG_external_package(igprof 5.9.14 )
+endif()
+if(${LCG_OS} STREQUAL slc)
+ if (NOT ${LCG_HOST_ARCH} STREQUAL i686)
+ LCG_external_package(CASTOR 2.1.13-6 castor )
+ LCG_external_package(cream 1.14.0-4 Grid/cream )
+ LCG_external_package(dcap 2.47.7-1 Grid/dcap )
+ LCG_external_package(dm-util 1.15.0-0 Grid/dm-util )
+ LCG_external_package(dpm 1.8.5-1 Grid/DPM )
+ LCG_external_package(epel 20130408 Grid/epel )
+ LCG_external_package(FTS 2.2.8emi2 Grid/FTS )
+ if(${LCG_OS}${LCG_OSVERS} STREQUAL slc6)
+ LCG_external_package(FTS3 0.0.1-88 Grid/FTS3 )
+ endif()
+ LCG_external_package(gfal 1.13.0-0 Grid/gfal )
+ LCG_external_package(gfal2 2.2.0-1 Grid/gfal2 )
+ LCG_external_package(gridftp_ifce 2.3.1-0 Grid/gridftp-ifce )
+ LCG_external_package(gridsite 1.7.25-1.emi2 Grid/gridsite )
+ LCG_external_package(is_ifce 1.15.0-0 Grid/is-ifce )
+ LCG_external_package(lb 3.2.9 Grid/lb )
+ LCG_external_package(lcgdmcommon 1.8.5-1 Grid/lcg-dm-common)
+ LCG_external_package(lcginfosites 3.1.0-3 Grid/lcg-infosites)
+ LCG_external_package(lfc 1.8.5-1 Grid/LFC )
+ LCG_external_package(srm_ifce 1.13.0-0 Grid/srm-ifce )
+ LCG_external_package(voms 2.0.9-1 Grid/voms )
+ LCG_external_package(WMS 3.4.0 Grid/WMS )
+ LCG_external_package(neurobayes 3.7.0 )
+ LCG_external_package(neurobayes_expert 3.7.0 )
+ endif()
+endif()
+
+#---Additional External packages------(Generators)-----------------
+
+set(MCGENPATH MCGenerators)
+
+LCG_external_package(lhapdf 6.1.5 ${MCGENPATH}/lhapdf )
+
+LCG_external_package(pythia8 HEAD ${MCGENPATH}/pythia8 )
+LCG_external_package(pythia8 175 ${MCGENPATH}/pythia8 )
+LCG_external_package(pythia8 176 ${MCGENPATH}/pythia8 )
+LCG_external_package(pythia8 180 ${MCGENPATH}/pythia8 )
+LCG_external_package(pythia8 185 ${MCGENPATH}/pythia8 )
+LCG_external_package(pythia8 201 ${MCGENPATH}/pythia8 )
+LCG_external_package(pythia8 205 ${MCGENPATH}/pythia8 )
+LCG_external_package(pythia8 186 ${MCGENPATH}/pythia8 )
+
+LCG_external_package(cython 0.19.1 ${MCGENPATH}/cython )
+LCG_external_package(cython 0.22 ${MCGENPATH}/cython )
+
+# Prepare the search paths according to the versions above
+LCG_prepare_paths()
diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt
index 306e9396bce8ed369d993c58f45404eadb59bf76..07db88aba847e6b2697f7fe8ba1c8facebf171d2 100644
--- a/generators/CMakeLists.txt
+++ b/generators/CMakeLists.txt
@@ -1506,7 +1506,9 @@ endforeach()
endif()
#---Starlight---------------------------------------------------------------------------------------
+if (starlight_native_version)
string(SUBSTRING ${starlight_native_version} 1 -1 STARLIGHT_REV)
+endif()
LCGPackage_Add(
starlight
URL ${gen_url}/starlight-r${STARLIGHT_REV}.tgz