diff --git a/repertory.iss.in b/repertory.iss.in
index d7031d5b..bb7559a8 100644
--- a/repertory.iss.in
+++ b/repertory.iss.in
@@ -33,7 +33,7 @@ DisableProgramGroupPage=yes
 LicenseFile=repertory\LICENSE.md
 ; Uncomment the following line to run in non administrative install mode (install for current user only).
 ;PrivilegesRequired=lowest
-OutputBaseFilename=repertory_{#MyAppVersion}_setup
+OutputBaseFilename=repertory_{#MyAppVersion}_windows_@PROJECT_MARCH@_setup
 SolidCompression=yes
 WizardStyle=modern
 
@@ -41,7 +41,7 @@ WizardStyle=modern
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Files]
-Source: "repertory\"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs uninsneveruninstall
+Source: "repertory\*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs uninsneveruninstall
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
diff --git a/scripts/make_package.sh b/scripts/make_package.sh
index ae706243..3b7d977d 100755
--- a/scripts/make_package.sh
+++ b/scripts/make_package.sh
@@ -64,14 +64,20 @@ create_file_validations "${PROJECT_OUT_FILE}"
 popd
 
 if [ "${PROJECT_IS_MINGW}" == "1" ] && [ -f "${PROJECT_DIST_DIR}/../${PROJECT_NAME}.iss" ]; then
-  pushd "${PROJECT_DIST_DIR}/../"
+  cp -f "${PROJECT_DIST_DIR}/../${PROJECT_NAME}.iss" "${TEMP_DIR}/${PROJECT_NAME}.iss"
+
+  pushd "${TEMP_DIR}"
   if [ "${PROJECT_IS_MINGW_UNIX}" == "1" ]; then
     wine64 "c:/Program Files (x86)/Inno Setup 6/iscc.exe" "${PROJECT_NAME}.iss" || exit 1
   else
     iscc "${PROJECT_NAME}.iss" || exit 1
   fi
 
-  create_file_validations "Output/${PROJECT_NAME}_${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_REVISION_VERSION}-${PROJECT_RELEASE_ITER}_${PROJECT_GIT_REV}_setup.exe"
+  pushd "Output"
+  create_file_validations "${PROJECT_FILE_PART}_setup.exe"
+  cp -f * "${PROJECT_DIST_DIR}/"
+  popd
+
   popd
 fi