diff --git a/mingw-w64-crt/ChangeLog b/mingw-w64-crt/ChangeLog
index 7bba3de..0b2596a 100644
--- a/mingw-w64-crt/ChangeLog
+++ b/mingw-w64-crt/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-08  Ozkan Sezer  <sezeroz@gmail.com>
+
+	* lib32/msvcrt.def (strnlen): Mark as DATA.
+	* lib64/msvcrt.def (strnlen): Likewise.
+
 2010-09-06  Ozkan Sezer  <sezeroz@gmail.com>
 
 	* misc/strnlen.c (strnlen): Better implementation from John E. / TDM.
diff --git a/mingw-w64-crt/lib32/msvcrt.def b/mingw-w64-crt/lib32/msvcrt.def
index 39092a5..2764b61 100644
--- a/mingw-w64-crt/lib32/msvcrt.def
+++ b/mingw-w64-crt/lib32/msvcrt.def
@@ -1185,7 +1185,7 @@
 strerror_s
 strncat_s
 strncpy_s
-strnlen
+strnlen DATA	; msvcrt in XP and lower doesn't have this
 strtok_s
 swprintf_s
 swscanf_s
diff --git a/mingw-w64-crt/lib64/msvcrt.def b/mingw-w64-crt/lib64/msvcrt.def
index 07b108d..5fdd521 100644
--- a/mingw-w64-crt/lib64/msvcrt.def
+++ b/mingw-w64-crt/lib64/msvcrt.def
@@ -1193,7 +1193,7 @@
 strncmp
 strncpy
 strncpy_s
-strnlen
+strnlen DATA	; msvcrt in XP and lower doesn't have this
 strpbrk
 strrchr
 strspn