diff --git a/Build/Win32/Export.bat b/Build/Win32/Export.bat
new file mode 100644
index 000000000..929a00ec7
--- /dev/null
+++ b/Build/Win32/Export.bat
@@ -0,0 +1,4 @@
+cd ..\..\Bin
+..\Import\upx\bin\upx -9 Cxbx.exe
+..\Import\upx\bin\upx -9 Cxbx.dll
+cd ..\Build\win32
diff --git a/Cxbx.dsp b/Cxbx.dsp
index 3ebdabaf5..8b966c58c 100644
--- a/Cxbx.dsp
+++ b/Cxbx.dsp
@@ -55,10 +55,6 @@ LINK32=xilink6.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
 # ADD LINK32 libjpeg.lib d3d8.lib dinput8.lib dxguid.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libc" /libpath:"lib"
 # SUBTRACT LINK32 /pdb:none /nodefaultlib
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Cmds=cd PostBuild	upxCxbx.bat
-# End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "Cxbx - Win32 Debug"
 
diff --git a/Doc/Cleanup.txt b/Doc/Cleanup.txt
index 808f69652..936889d5b 100644
--- a/Doc/Cleanup.txt
+++ b/Doc/Cleanup.txt
@@ -12,6 +12,8 @@ Legend :
   [ Completed, Update email sent
   ~ Follow-Up Comment
 
+: Import/Export
+  * Pull upx in with Import folder
 : Structure
   * Move all includes into Source (since they are not exported!)
   - Organize all #include's cleanly, and use good relative paths when desirable
diff --git a/PostBuild/upx.exe b/Import/upx/bin/upx.exe
similarity index 100%
rename from PostBuild/upx.exe
rename to Import/upx/bin/upx.exe
diff --git a/PostBuild/upxCxbx.bat b/PostBuild/upxCxbx.bat
deleted file mode 100644
index d7e5f5fb9..000000000
--- a/PostBuild/upxCxbx.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-upx -9 ../Bin/Cxbx.exe
-upx -9 ../Bin/Cxbx.dll