diff --git a/build.xml b/build.xml
index 6595901db..45fc30eba 100644
--- a/build.xml
+++ b/build.xml
@@ -177,13 +177,13 @@
         <copy file="installer/resources/i2prouter" todir="pkg-temp/" />
         <copy file="installer/resources/i2prouter.bat" todir="pkg-temp/" />
         <copy file="installer/resources/i2ptunnel.config" todir="pkg-temp/" />
-        <copy file="installer/resources/install_i2p_service_unix" todir="pkg-temp/" />
+        <!-- <copy file="installer/resources/install_i2p_service_unix" todir="pkg-temp/" /> -->
         <copy file="installer/resources/install_i2p_service_winnt.bat" todir="pkg-temp/" />
         <copy file="installer/resources/osid" todir="pkg-temp/" />
         <copy file="installer/resources/postinstall.bat" todir="pkg-temp/" />
         <copy file="installer/resources/postinstall.sh" todir="pkg-temp/" />
         <copy file="installer/resources/systray.config" todir="pkg-temp/" />
-        <copy file="installer/resources/uninstall_i2p_service_unix" todir="pkg-temp/" />
+        <!-- <copy file="installer/resources/uninstall_i2p_service_unix" todir="pkg-temp/" /> -->
         <copy file="installer/resources/uninstall_i2p_service_winnt.bat" todir="pkg-temp/" />
         <copy file="installer/resources/wrapper.conf" todir="pkg-temp/" />
         <copy todir="pkg-temp/lib/wrapper/freebsd/">
diff --git a/history.txt b/history.txt
index bfd3d1765..7f679bb45 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,11 @@
-$Id: history.txt,v 1.2 2004/09/02 16:26:03 jrandom Exp $
+$Id: history.txt,v 1.3 2004/09/03 02:22:24 jrandom Exp $
+
+2004-09-03  hypercubus
+    * Bugfix: Installer launches postinstall.bat on WinNT/2K properly.
+    * Temporarily removed install_i2p_service_unix and
+      uninstall_i2p_service_unix from distribution packages.
+    * postinstall.bat/postinstall.sh cleans installation directory of all files
+      not applicable to the host OS.
 
 2004-09-03  oOo
     * Added some filters to the HTTP request, replacing the User-Agent,
diff --git a/installer/resources/ProcessPanel.Spec.xml b/installer/resources/ProcessPanel.Spec.xml
index 78719366c..30c68d3a0 100644
--- a/installer/resources/ProcessPanel.Spec.xml
+++ b/installer/resources/ProcessPanel.Spec.xml
@@ -3,7 +3,7 @@
 <processing>
     <job name="Launching I2P...">
         <os family="windows" />
-        <executefile name="C:\Windows\System32\cmd.exe">
+        <executefile name="cmd.exe">
             <arg>/c</arg><arg>"$INSTALL_PATH\postinstall.bat"</arg>
         </executefile>
     </job>
diff --git a/installer/resources/postinstall.bat b/installer/resources/postinstall.bat
index 4829ad50d..6f388c9ed 100644
--- a/installer/resources/postinstall.bat
+++ b/installer/resources/postinstall.bat
@@ -16,4 +16,12 @@ set INSTALL_PATH=%~dp0
 copy "%INSTALL_PATH%lib\wrapper\win32\I2Psvc.exe" "%INSTALL_PATH%"
 copy "%INSTALL_PATH%lib\wrapper\win32\wrapper.dll" "%INSTALL_PATH%lib"
 copy "%INSTALL_PATH%lib\wrapper\win32\wrapper.jar" "%INSTALL_PATH%lib"
+del /f /q "%INSTALL_PATH%i2prouter"
+:: del /f /q "%INSTALL_PATH%install_i2p_service_unix"
+del /f /q "%INSTALL_PATH%install-headless.txt"
+del /f /q "%INSTALL_PATH%osid"
+del /f /q "%INSTALL_PATH%postinstall.sh"
+:: del /f /q "%INSTALL_PATH%uninstall_i2p_service_unix"
+del /f /q "%INSTALL_PATH%icons\*.xpm"
+rmdir /q /s "%INSTALL_PATH%lib\wrapper"
 start /b /i /d"%INSTALL_PATH%" i2prouter.bat
diff --git a/installer/resources/postinstall.sh b/installer/resources/postinstall.sh
index 0ba341509..c4d033271 100644
--- a/installer/resources/postinstall.sh
+++ b/installer/resources/postinstall.sh
@@ -17,9 +17,9 @@ if [ ! "X$1" = "X" ]; then
 fi
 
 chmod 744 ./i2prouter
-chmod 744 ./install_i2p_service_unix
+# chmod 744 ./install_i2p_service_unix
 chmod 744 ./osid
-chmod 744 ./uninstall_i2p_service_unix
+# chmod 744 ./uninstall_i2p_service_unix
 
 ERROR_MSG="Cannot determine operating system type. From the subdirectory in lib/wrapper matching your operating system, please move i2psvc to your base I2P directory, and move the remaining two files to the lib directory."
 
@@ -56,6 +56,10 @@ esac
 cp $wrapperpath/wrapper.jar ./lib/
 cp $wrapperpath/i2psvc .
 chmod 744 ./i2psvc
+rm -rdf ./icons
+rm -rdf ./lib/wrapper
+rm -f ./lib/*.dll
+rm -f ./*.bat
 ./i2prouter start
 exit 0