diff --git a/Docs/src/history.but b/Docs/src/history.but
index 7185f76e..24c9c586 100644
--- a/Docs/src/history.but
+++ b/Docs/src/history.but
@@ -10,6 +10,8 @@ Released on ? ?th, 2016
 
 \b More security hardening to prevent dll hijacking
 
+\b The name of the uninstaller created in %TEMP%\\~nsu.tmp has changed from %UNIQUE%u_.exe to Un_%UNIQUE%.exe
+
 \S2{} Translations
 
 \b Added missing MULTIUSER_* entries to Japanese.nsh (\W{http://sf.net/p/nsis/patches/266}{patch #266})
diff --git a/Source/build.cpp b/Source/build.cpp
index 933ba7e6..00c022a0 100644
--- a/Source/build.cpp
+++ b/Source/build.cpp
@@ -2301,8 +2301,8 @@ void CEXEBuild::AddStandardStrings()
 #ifdef NSIS_CONFIG_UNINSTALL_SUPPORT
   if (uninstall_mode)
   {
-    cur_header->str_uninstchild = add_asciistring(_T("$TEMP\\$1u_.exe"));
-    cur_header->str_uninstcmd = add_asciistring(_T("\"$TEMP\\$1u_.exe\" $0 _?=$INSTDIR\\"));
+    cur_header->str_uninstchild = add_asciistring(_T("$TEMP\\Un_$1.exe"));
+    cur_header->str_uninstcmd = add_asciistring(_T("\"$TEMP\\Un_$1.exe\" $0 _?=$INSTDIR\\"));
   }
 #endif//NSIS_CONFIG_UNINSTALL_SUPPORT
 #ifdef NSIS_SUPPORT_MOVEONREBOOT
diff --git a/Source/exehead/Main.c b/Source/exehead/Main.c
index 3e6f76cd..f67c65aa 100644
--- a/Source/exehead/Main.c
+++ b/Source/exehead/Main.c
@@ -320,7 +320,7 @@ EXTERN_C void NSISWinMainNOCRT()
       {
         static TCHAR buf2[NSIS_MAX_STRLEN];
 
-        GetNSISString(buf2,g_header->str_uninstchild); // $TEMP\$1u_.exe
+        GetNSISString(buf2,g_header->str_uninstchild); // $TEMP\Un_$1.exe
 
         DeleteFile(buf2); // clean up after all the other ones if they are there
 
@@ -333,7 +333,7 @@ EXTERN_C void NSISWinMainNOCRT()
 #ifdef NSIS_SUPPORT_MOVEONREBOOT
             MoveFileOnReboot(buf2,NULL);
 #endif
-            GetNSISString(buf2,g_header->str_uninstcmd); // '"$TEMP\$1u_.exe" $0 _?=$INSTDIR\'
+            GetNSISString(buf2,g_header->str_uninstcmd); // '"$TEMP\Un_$1.exe" $0 _?=$INSTDIR\'
             hProc=myCreateProcess(buf2);
             if (hProc)
             {