diff --git a/legacy/evil/ChangeLog b/legacy/evil/ChangeLog
index 540a8635d9..cea9615013 100644
--- a/legacy/evil/ChangeLog
+++ b/legacy/evil/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-20  Vincent Torri  <doursse at users dot sf dot net>
+
+	* evil_stdlib.c:
+	fix mkstemp() which didn't remove the file when the last
+	file descriptor was closed
+
 2011-02-27  Vincent Torri  <doursse at users dot sf dot net>
 
 	* configure.ac:
diff --git a/legacy/evil/src/lib/evil_stdlib.c b/legacy/evil/src/lib/evil_stdlib.c
index 492bc63ab6..8034c24cfc 100644
--- a/legacy/evil/src/lib/evil_stdlib.c
+++ b/legacy/evil/src/lib/evil_stdlib.c
@@ -316,7 +316,7 @@ mkstemp(char *__template)
         v /= 62;
 
 #ifndef __MINGW32CE__
-        fd = _open(__template, _O_RDWR | _O_BINARY | _O_CREAT | _O_EXCL, _S_IREAD | _S_IWRITE);
+        fd = _open(__template, _O_RDWR | _O_BINARY | _O_CREAT | _O_TEMPORARY | _O_EXCL, _S_IREAD | _S_IWRITE);
 #else /* ! __MINGW32CE__ */
         {
            FILE    *f;