diff --git a/src/base/CreatePBP.cmake b/src/base/CreatePBP.cmake
index 640b02d6..641e5f47 100644
--- a/src/base/CreatePBP.cmake
+++ b/src/base/CreatePBP.cmake
@@ -121,10 +121,15 @@ macro(create_pbp_file)
       )
   endif()
   
+  get_target_property(PBP_TARGET_OUTPUT_DIR ${ARG_TARGET} RUNTIME_OUTPUT_DIRECTORY)
+  if(PBP_TARGET_OUTPUT_DIR STREQUAL PBP_TARGET_OUTPUT_DIR-NOTFOUND)
+	set(PBP_TARGET_OUTPUT_DIR ".")
+  endif()
+
   add_custom_command(
     TARGET ${ARG_TARGET}
     POST_BUILD COMMAND
-    "${PSPDEV}/bin/mksfoex" "-d" "MEMSIZE=1" "-s" "APP_VER=${ARG_VERSION}" "${ARG_TITLE}" "PARAM.SFO"
+    "${PSPDEV}/bin/mksfoex" "-d" "MEMSIZE=1" "-s" "APP_VER=${ARG_VERSION}" "${ARG_TITLE}" "${PBP_TARGET_OUTPUT_DIR}/PARAM.SFO"
     COMMENT "Calling mksfoex"
     )
 
@@ -132,7 +137,7 @@ macro(create_pbp_file)
     add_custom_command(
       TARGET ${ARG_TARGET}
       POST_BUILD COMMAND
-      "${PSPDEV}/bin/pack-pbp" "EBOOT.PBP" "PARAM.SFO" "${ARG_ICON_PATH}" "NULL" "${ARG_PREVIEW_PATH}"
+      "${PSPDEV}/bin/pack-pbp" "${PBP_TARGET_OUTPUT_DIR}/EBOOT.PBP" "${PBP_TARGET_OUTPUT_DIR}/PARAM.SFO" "${ARG_ICON_PATH}" "NULL" "${ARG_PREVIEW_PATH}"
       "${ARG_BACKGROUND_PATH}" "${ARG_MUSIC_PATH}" "$<TARGET_FILE:${ARG_TARGET}>.prx" "NULL"
       COMMENT "Calling pack-pbp with PRX file"
       )
@@ -140,7 +145,7 @@ macro(create_pbp_file)
     add_custom_command(
       TARGET ${ARG_TARGET}
       POST_BUILD COMMAND
-      "${PSPDEV}/bin/pack-pbp" "EBOOT.PBP" "PARAM.SFO" "${ARG_ICON_PATH}" "NULL" "${ARG_PREVIEW_PATH}"
+      "${PSPDEV}/bin/pack-pbp" "${PBP_TARGET_OUTPUT_DIR}/EBOOT.PBP" "${PBP_TARGET_OUTPUT_DIR}/PARAM.SFO" "${ARG_ICON_PATH}" "NULL" "${ARG_PREVIEW_PATH}"
       "${ARG_BACKGROUND_PATH}" "${ARG_MUSIC_PATH}" "$<TARGET_FILE:${ARG_TARGET}>" "NULL"
       COMMENT "Calling pack-pbp with ELF file"
       )