diff --git a/CMakeLists.txt b/CMakeLists.txt
index b001942a73..29d0e86b40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -418,6 +418,7 @@ endif()
 # Generate source assembly
 set(ASSEMBLY_BASE_NAME "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 if(WIN32)
+    set(CPACK_PRE_BUILD_SCRIPTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/prep_for_win_package.cmake")
     set(CPACK_ALL_INSTALL_TYPES Full Developer)
     set(CPACK_COMPONENT_LIBRARIES_INSTALL_TYPES Developer Full)
     set(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer Full)
diff --git a/bootstrap/package_manager.py b/bootstrap/package_manager.py
index 520750ec8d..972d42dc26 100644
--- a/bootstrap/package_manager.py
+++ b/bootstrap/package_manager.py
@@ -230,7 +230,7 @@ def _minifi_setup_env_str(vs_where_location: VsWhereLocation) -> str:
 
 
 def _create_minifi_setup_env_batch(vs_where_location: VsWhereLocation):
-    with open("build_environment.bat", "w") as f:
+    with open(pathlib.Path(__file__).parent.resolve() / "build_environment.bat", "w") as f:
         f.write(_minifi_setup_env_str(vs_where_location))
 
 
diff --git a/cmake/prep_for_win_package.cmake b/cmake/prep_for_win_package.cmake
new file mode 100644
index 0000000000..7bafff1933
--- /dev/null
+++ b/cmake/prep_for_win_package.cmake
@@ -0,0 +1 @@
+file(COPY "${CPACK_PACKAGE_DIRECTORY}/bin/minifi.exe" DESTINATION "${CPACK_PACKAGE_DIRECTORY}/minifi_main")