diff --git a/Documentation/RelNotes/1.8.4.txt b/Documentation/RelNotes/1.8.4.txt
index b4f8737..b0a59ec 100644
--- a/Documentation/RelNotes/1.8.4.txt
+++ b/Documentation/RelNotes/1.8.4.txt
@@ -242,6 +242,13 @@
 
 Performance, Internal Implementation, etc.
 
+ * On Cygwin, we used to use our own lstat(2) emulation that is
+   allegedly faster than the platform one in codepaths where some of
+   the information it returns did not matter, but it started to bite
+   us in a few codepaths where the trick it uses to cheat does show
+   breakages. This emulation has been removed and we use the native
+   lstat(2) emulation supplied by Cygwin now.
+
  * The function attributes extensions are used to catch mistakes in
    use of our own variadic functions that use NULL sentinel at the end
    (i.e. like execl(3)) and format strings (i.e. like printf(3)).
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index ede98a8..2c49e42 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.4-rc1
+DEF_VER=v1.8.4-rc2
 
 LF='
 '