diff --git a/history.txt b/history.txt
index 9035e747e5..2d83a709c6 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,9 @@
+2011-08-26 kytv
+  * Debian: Bugfix: Avoid overwriting preseeded debconf values
+    upon package installation (ticket #514).
+  * Windows: Fix bug in fixperms.bat that occurred when installing on
+    non-English versions of Windows 7 and Vista.
+
 2011-08-25 zzz
   * Blockfile:
     - Avoid NPE after corruption (ticket #515)
@@ -66,7 +72,7 @@
            to speed integration
 
 2011-07-30 kytv
- * Installer: 
+ * Installer:
    - add libjbigi*core*jnilib, libjbigi-osx-none_64.jnilib, and
      libjbigi-linux-ppc.so
    - Add Linux PPC wrapper
diff --git a/installer/resources/fix_logfile_path.cmd b/installer/resources/fix_logfile_path.cmd
index 2bc04137d5..2f7784f85c 100644
--- a/installer/resources/fix_logfile_path.cmd
+++ b/installer/resources/fix_logfile_path.cmd
@@ -7,7 +7,7 @@
 ::
 :: On every *NIX-like system, $SYSTEM_java_io_tmpdir/wrapper.log points to a system-level
 :: temp directory (/tmp on Linux, /var/tmp on BSD, etc.), but in Windows the value of %temp%
-:: depends on whose account a process is running under. If the same user that installs I2P 
+:: depends on whose account a process is running under. If the same user that installs I2P
 :: is the only one that will run I2P, this isn't a problem.
 ::
 :: The problem comes from trying to run the process as a service, or trying to run under an
@@ -29,5 +29,3 @@ cd /d %~dp0
 findstr /V /R "^wrapper.logfile=" wrapper.config > wrapper.new
 echo wrapper.logfile=%%temp%%\wrapper.log >> wrapper.new
 move wrapper.new wrapper.config
-
-:: As an added bonus, wrapper.config now has DOS line endings in Windows.
diff --git a/installer/resources/fixperms.bat b/installer/resources/fixperms.bat
index 75cb715abc..853f0682b4 100755
--- a/installer/resources/fixperms.bat
+++ b/installer/resources/fixperms.bat
@@ -1,11 +1,19 @@
-:: Fix Vista permission problems
-:: From http://www.nabble.com/Classpath-security-issues-on-Vista-td22456230.html
-::
-:: 'echo Y' to get past the 'are you sure' question...
-:: cacls requires it on XP, icacls doesnt appear so, but can't hurt
-:: F : full control
-:: /c : continue on error
-:: /q : quiet
-:: /t : recursive
-::
-echo Y|icacls %1 /grant Users:F /c /t > %1%\fixperms.log
+:: Fix Vista permission problems
+:: From http://www.nabble.com/Classpath-security-issues-on-Vista-td22456230.html
+::
+:: 'echo Y' to get past the 'are you sure' question...
+:: cacls requires it on XP, icacls doesnt appear so, but can't hurt
+:: F : full control
+:: /c : continue on error
+:: /q : quiet
+:: /t : recursive
+::
+:: Note: We should not use the group name "Users" since this group will not
+:: exist on non-English versions of Windows.
+::
+:: S-1-5-32-545 = Users (en). Benutzer (de), etc.
+::
+:: Specifying the SID will work on ALL versions of Windows.
+:: List of well-known SIDs at http://support.microsoft.com/kb/243330/en-us
+::
+echo Y|icacls %1 /grant  *S-1-5-32-545:F /c /t > %1%\fixperms.log