diff --git a/cmake/PCHSupport.cmake b/cmake/PCHSupport.cmake
index c0810aa0..74bd4158 100644
--- a/cmake/PCHSupport.cmake
+++ b/cmake/PCHSupport.cmake
@@ -77,7 +77,7 @@ function(ADD_CXX_PCH TARGET_NAME PRECOMPILED_HEADER PRECOMPILED_SOURCE)
         endif()
 
         # Create and set output directory.
-        set(OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}")
+        set(OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}_${CMAKE_BUILD_TYPE}_${SFX}")
         set(OUTPUT_NAME "${OUTPUT_DIR}/${PRECOMPILED_HEADER_NAME}.${SFX}")
 
         make_directory(${OUTPUT_DIR})
diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt
index e566d1a4..04d224cc 100644
--- a/src/game/CMakeLists.txt
+++ b/src/game/CMakeLists.txt
@@ -226,6 +226,10 @@ add_library(game STATIC
     ${SRC_GRP_WORLD_HANDLERS}
     $<$<BOOL:${SCRIPT_LIB_ELUNA}>:${SRC_GRP_ELUNA}>
     $<$<BOOL:${PLAYERBOTS}>:${SRC_GRP_BOTS}>
+    $<$<BOOL:${PCH}>:
+        pchdef.h
+        pchdef.cpp
+    >
 )
 
 target_include_directories(game