diff --git a/src/framework/core/CMakeLists.txt b/src/framework/core/CMakeLists.txt
index 558b227f68801ec98c794c832ae5d8e654c1a703..f0edcdebd80fd61962c258b8e8ab43963030e5f6 100644
--- a/src/framework/core/CMakeLists.txt
+++ b/src/framework/core/CMakeLists.txt
@@ -5,7 +5,7 @@ file (MAKE_DIRECTORY ${output_dir})
 
 add_custom_command (
   OUTPUT  ${output_dir}/GeneratedParticleProperties.inc
-  OUTPUT  ${output_dir}/GeneratedParticleClasses.inc
+          ${output_dir}/GeneratedParticleClasses.inc
           ${output_dir}/particle_db.pkl
   COMMAND ${input_dir}/pdxml_reader.py ${input_dir}/ParticleData.xml
                                        ${input_dir}/NuclearData.xml
@@ -22,7 +22,9 @@ add_custom_command (
 
 add_custom_target (GenParticlesHeaders
   DEPENDS ${output_dir}/GeneratedParticleProperties.inc
-          ${output_dir}/GeneratedParticleClasses.inc)
+          ${output_dir}/GeneratedParticleClasses.inc
+          ${output_dir}/particle_db.pkl
+  )
 add_dependencies (CORSIKA8 GenParticlesHeaders)
 
 install (
diff --git a/src/modules/qgsjetII/CMakeLists.txt b/src/modules/qgsjetII/CMakeLists.txt
index 36ebe9b693b927de9acfca03be3dc016440c4050..9b9777356e511db01238c2a68389c5c476e738a7 100644
--- a/src/modules/qgsjetII/CMakeLists.txt
+++ b/src/modules/qgsjetII/CMakeLists.txt
@@ -10,7 +10,7 @@ add_custom_command (
           ${input_dir}/qgsjet-II-04-codes.dat
   DEPENDS ${input_dir}/code_generator.py
           ${input_dir}/qgsjet-II-04-codes.dat
-          GenParticlesHeaders # for particle_db.pkl
+          ${PROJECT_BINARY_DIR}/corsika/framework/core/particle_db.pkl
   WORKING_DIRECTORY
           ${output_dir}
   COMMENT "Generate conversion tables for particle codes QGSJetII <-> CORSIKA"
diff --git a/src/modules/sibyll/CMakeLists.txt b/src/modules/sibyll/CMakeLists.txt
index b3d97a12349a5a5f2cbd9917404a8685894f0096..969d2f1d2e0e1bada1a4c247901ef381c121d368 100644
--- a/src/modules/sibyll/CMakeLists.txt
+++ b/src/modules/sibyll/CMakeLists.txt
@@ -10,7 +10,7 @@ add_custom_command (
           ${input_dir}/sibyll_codes.dat
   DEPENDS ${input_dir}/code_generator.py
           ${input_dir}/sibyll_codes.dat
-          GenParticlesHeaders # for particle_db.pkl
+          ${PROJECT_BINARY_DIR}/corsika/framework/core/particle_db.pkl
   WORKING_DIRECTORY
           ${output_dir}/
   COMMENT "Generate conversion tables for particle codes SIBYLL <-> CORSIKA"