diff --git a/Installation/Jenkins/build.sh b/Installation/Jenkins/build.sh
index 0cabaa94ba..89f18cf3b2 100755
--- a/Installation/Jenkins/build.sh
+++ b/Installation/Jenkins/build.sh
@@ -564,18 +564,26 @@ if test -n "${TARGET_DIR}";  then
         ${PACKAGE_MAKE} copy_packages
         ${PACKAGE_MAKE} clean_packages
     else
+        # we re-use a generic cpack tarball:
+        ${PACKAGE_MAKE} TGZ_package
+        PKG_NAME=`grep CPACK_PACKAGE_FILE_NAME CPackConfig.cmake  |sed -e 's;".$;;' -e 's;.*";;'`
+
+        
         TARFILE=arangodb-`uname`${TAR_SUFFIX}.tar.gz
         TARFILE_TMP=`pwd`/arangodb.tar.$$
+        trap "rm -rf ${TARFILE_TMP}" EXIT
 
         mkdir -p ${dir}
-        trap "rm -rf ${TARFILE_TMP}" EXIT
+
+        cp -a ${SOURCE_DIR}/_CPack_Packages/*/TGZ/${PKG_NAME}/* ${dir}
+        rm -rf ${dir}/share/arangodb3/js
 
         (cd ${SOURCE_DIR}
 
          touch 3rdParty/.keepme
          touch arangod/.keepme
          touch arangosh/.keepme
-
+                               
          tar -c -f ${TARFILE_TMP} \
              VERSION utils scripts etc/relative etc/testing UnitTests Documentation js \
              lib/Basics/errors.dat \
diff --git a/cmake/packages/packages.cmake b/cmake/packages/packages.cmake
index 93c586dcfa..2e6a293bcc 100644
--- a/cmake/packages/packages.cmake
+++ b/cmake/packages/packages.cmake
@@ -37,6 +37,16 @@ elseif (MSVC)
   include(packages/nsis)
 endif ()
 
+################################################################################
+## generic tarball
+################################################################################
+set(CPACK_PACKAGE_TGZ "${CMAKE_BINARY_DIR}/${CPACK_PACKAGE_FILE_NAME}.tar.gz")
+add_custom_target(TGZ_package
+  COMMENT "create TGZ-package"
+  COMMAND ${CMAKE_CPACK_COMMAND} -G TGZ  -C ${CMAKE_BUILD_TYPE}
+  )
+
+
 ################################################################################
 ## SNAPCRAFT PACKAGE
 ################################################################################
diff --git a/cmake/packages/snap.cmake b/cmake/packages/snap.cmake
index 5e873e2e64..ea7dcf0cd1 100644
--- a/cmake/packages/snap.cmake
+++ b/cmake/packages/snap.cmake
@@ -7,7 +7,6 @@ endif()
 if(SNAPCRAFT_FOUND)
   set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${ARANGODB_PACKAGE_REVISION}_${ARANGODB_PACKAGE_ARCHITECTURE}")
   set(SNAPCRAFT_TEMPLATE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Installation/Ubuntu")
-  set(CPACK_PACKAGE_TGZ "${CMAKE_BINARY_DIR}/${CPACK_PACKAGE_FILE_NAME}.tar.gz")
   set(SNAPCRAFT_SOURCE_DIR "${CMAKE_BINARY_DIR}/_CPack_Packages/SNAP")
 
   message(STATUS "Create snap package")
@@ -35,16 +34,11 @@ if(SNAPCRAFT_FOUND)
     DESTINATION "${SNAPCRAFT_SOURCE_DIR}/"
   )
 
-  add_custom_target(snap_TGZ
-    COMMENT "create TGZ-package"
-    COMMAND ${CMAKE_CPACK_COMMAND} -G TGZ
-  )
-
   add_custom_target(snap
     COMMENT "create snap-package"
     COMMAND ${SNAP_EXE} snap
     COMMAND cp *.snap ${PROJECT_BINARY_DIR}
-    DEPENDS snap_TGZ
+    DEPENDS TGZ_package
     WORKING_DIRECTORY ${SNAPCRAFT_SOURCE_DIR}
   )