diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 5a8024312..79134b23d 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-10  Corinna Vinschen  <corinna@vinschen.de>
+
+	*  miscfuncs.cc: Fix comment preceeding x86_64 memset and friends.
+
 2015-08-10  Corinna Vinschen  <corinna@vinschen.de>
 
 	* uinfo.cc (cygheap_user::ontherange): Revert previous patch.
diff --git a/winsup/cygwin/miscfuncs.cc b/winsup/cygwin/miscfuncs.cc
index 2b3c6b879..4794d3145 100644
--- a/winsup/cygwin/miscfuncs.cc
+++ b/winsup/cygwin/miscfuncs.cc
@@ -898,10 +898,11 @@ err:
 }
 
 #ifdef __x86_64__
-/* These functions are almost verbatim NetBSD code, just wrapped in the
-   minimum required code to make them work with the MS AMD64 ABI.
-   See NetBSD src/lib/libc/amd64/string/memset.S
-   and NetBSD src/lib/libc/amd64/string/bcopy.S */
+/* These functions are almost verbatim FreeBSD code (even if ther header of
+   one file mentioneds NetBSD), just wrapped in the minimum required code to
+   make them work with the MS AMD64 ABI.
+   See FreeBSD src/lib/libc/amd64/string/memset.S
+   and FreeBSD src/lib/libc/amd64/string/bcopy.S */
 
 asm volatile ("								\n\
 /*									\n\