diff --git a/deployment/linux/create_bundle.py b/deployment/linux/create_bundle.py
index 0d6d4f89e7f9841befd7f19866e4e37d67959d09..a957c8faafacd139d9b0bdd57d8cc74525238c5f 100644
--- a/deployment/linux/create_bundle.py
+++ b/deployment/linux/create_bundle.py
@@ -54,23 +54,30 @@ subprocess.call('sed "s/\#export LD_LIBRARY_PATH/ export LD_LIBRARY_PATH/g" scri
 subprocess.call('sed "s/\#export PYTHONHOME/ export PYTHONHOME/g" scripts/dng.in.preprepre > scripts/dng.in.prepre',shell=True,cwd='../../')
 subprocess.call('sed "s/\#export PYTHONPATH/ export PYTHONPATH/g" scripts/dng.in.prepre > scripts/dng.in.pre',shell=True,cwd='../../')
 subprocess.call('sed "s/\#export QT_PLUGIN_PATH/ export QT_PLUGIN_PATH/g" scripts/dng.in.pre > scripts/dng.in',shell=True,cwd='../../')
-print 'Downloading Chemlib dictionary'
-subprocess.call('wget ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif', shell=True, cwd='../../')
+#print 'Downloading Chemlib dictionary'
+#subprocess.call('wget ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif', shell=True, cwd='../../')
+#print 'Compiling Openstructure'
+#subprocess.call('cmake ./ -DCMAKE_BUILD_TYPE=Release -DPREFIX='+directory_name+' -DBoost_COMPILER='+boost_string+'-DENABLE_IMG=OFF -DENABLE_UI=OFF -DENABLE_GFX=OFF', shell=True,cwd='../../')
+#subprocess.call('make -j5',shell=True,cwd='../../')
+#print 'Converting Chemlib dictionary'
+#subprocess.call('stage/bin/chemdict_tool create components.cif compounds.chemlib', shell=True, cwd='../../')
+#print '\nStaging Chemlib dictionary'
 print 'Compiling Openstructure'
-subprocess.call('cmake ./ -DCMAKE_BUILD_TYPE=Release -DPREFIX='+directory_name+' -DBoost_COMPILER='+boost_string+'-DENABLE_IMG=OFF -DENABLE_UI=OFF -DENABLE_GFX=OFF', shell=True,cwd='../../')
-subprocess.call('make -j5',shell=True,cwd='../../')
-print 'Converting Chemlib dictionary'
-subprocess.call('stage/bin/chemdict_tool create components.cif compounds.chemlib', shell=True, cwd='../../')
-print '\nStaging Chemlib dictionary'
-subprocess.call('cmake ./ -DCOMPOUND_LIB=compounds.chemlib -DENABLE_IMG=ON -DENABLE_UI=ON -DENABLE_GFX=ON',shell=True,cwd='../../')
+subprocess.call('cmake ./ -DCOMPOUND_LIB=ChemLib/compounds.chemlib -DENABLE_IMG=ON -DENABLE_UI=ON -DENABLE_GFX=ON',shell=True,cwd='../../')
 subprocess.call('make -j5',shell=True,cwd='../../')
 print 'Removing obsolete packages and package directory'
 subprocess.call('rm -fr openstructure-linux*',shell=True,cwd='../../')
 print 'Creating new package directory'
 subprocess.call('mkdir '+directory_name,shell=True,cwd='../../')
 subprocess.call('mkdir '+directory_name+'/bin',shell=True,cwd='../../')
-so_list=[]
+rint 'Copy python executable into stage for dependency detection'
+subprocess.call('cp '+system_python_bin+ ' 'stage/bin/python',shell=True,cwd='../../')
+print 'Copy python libraries into the stage for dependency detection'
+subprocess.call('cp -pRL '+system_python_libs+' stage/'+libdir,shell=True,cwd='../../')
+if second_system_python_libs_flag==True:
+  subprocess.call('cp -pRL '+second_system_python_libs+'/* stage/'+libdir+'/'+name_python_bin,shell=True,cwd='../../')
 print 'Creating new dependency list'
+so_list=[]
 walk_list=os.walk('../../stage')
 for dir_entry in walk_list:
   for file_entry in dir_entry[2]:
@@ -98,7 +105,7 @@ subprocess.call('mkdir '+directory_name+'/'+libdir,shell=True,cwd='../../')
 for entry in filtered_dep_list:
   subprocess.call('cp '+entry+' '+directory_name+'/'+libdir,shell=True,cwd='../../')
 print 'Copy python executable into package directory structure'
-subprocess.call('cp '+system_python_bin+ ' '+directory_name+'/bin',shell=True,cwd='../../')
+subprocess.call('cp '+system_python_bin+ ' '+directory_name+'/bin/python',shell=True,cwd='../../')
 print 'Copy python libraries into package directory structure'
 subprocess.call('cp -pRL '+system_python_libs+' '+directory_name+'/'+libdir,shell=True,cwd='../../')
 if second_system_python_libs_flag==True: