diff --git a/Assets/ExternalTools/.keep b/Assets/ExternalTools/.keep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Assets/Tools/.gitempty b/Assets/Tools/.gitempty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Dist/Package.sh b/Dist/Package.sh
index b966c8689c..5428527a11 100755
--- a/Dist/Package.sh
+++ b/Dist/Package.sh
@@ -8,7 +8,6 @@ find "output" -type f \( -wholename "output/EmuHawk.exe" -o -wholename "output/D
 	-not -wholename "output/dll/*.xml" -not -wholename "output/dll/libsneshawk-64*.exe" -not -wholename "output/dll/gpgx.elf" -not -wholename "output/dll/miniclient.*" \
 	-exec install -D -m644 "{}" "packaged_{}" \;
 cd "$targetDir"
-mkdir "Firmware"
 if [ "$1" = "windows-x64" ]; then
 	rm -f "EmuHawkMono.sh"
 	cd "dll"
diff --git a/src/MainSlnExecutable.props b/src/MainSlnExecutable.props
index 0630c85523..d184891f85 100644
--- a/src/MainSlnExecutable.props
+++ b/src/MainSlnExecutable.props
@@ -21,5 +21,6 @@
 		</ItemGroup>
 		<Move SourceFiles="@(NotExecFilesFromExecProj)" DestinationFolder="$(OutputPath)dll/" />
 		<Move SourceFiles="@(ExecFilesFromExecProj)" DestinationFiles="@(ExecFilesFromExecProj->Replace('BizHawk.Client.', ''))" />
+		<MakeDir Directories="$(OutputPath)ExternalTools;$(OutputPath)Firmware;$(OutputPath)Tools" />
 	</Target>
 </Project>