diff --git a/ChangeLog b/ChangeLog
index fd53b41e3f..30f89fdeef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-04-08  Andreas Jaeger  <aj@suse.de>
 
+	[BZ #6890]
+	* manual/filesys.texi (Directory Entries): Clarify that it's file
+	system not operating system in the description of DT_UNKNOWN.
+
 	[BZ #6578]
 	* manual/syslog.texi (closelog): Fix reference, it's openlog.
 
diff --git a/NEWS b/NEWS
index 3a402f2908..002b8312f5 100644
--- a/NEWS
+++ b/NEWS
@@ -12,14 +12,15 @@ Version 2.16
   174, 350, 369, 411, 2541, 2547, 2548, 2551, 2552, 2553, 2554, 2562, 2563,
   2565, 2566, 2576, 2678, 3335, 3866, 3868, 3976, 3992, 4026, 4108, 4596,
   4822, 5077, 5461, 5805, 5993, 6471, 6486, 6578, 6649, 6730, 6770, 6884,
-  6907, 6911, 9739, 9902, 10110, 10135, 10140, 10210, 10346, 10545, 10716,
-  11174, 11322, 11365, 11451, 11494, 12047, 12340, 13058, 13525, 13526,
-  13527, 13528, 13529, 13530, 13531, 13532, 13533, 13547, 13551, 13552,
-  13553, 13555, 13559, 13566, 13583, 13592, 13618, 13637, 13656, 13658,
-  13673, 13691, 13695, 13704, 13706, 13726, 13738, 13760, 13761, 13786,
-  13792, 13806, 13824, 13840, 13841, 13844, 13846, 13851, 13852, 13854,
-  13871, 13879, 13883, 13892, 13895, 13908, 13910, 13911, 13912, 13913,
-  13915, 13916, 13917, 13918, 13919, 13920, 13921, 13926, 13928, 13938
+  6890, 6907, 6911, 9739, 9902, 10110, 10135, 10140, 10210, 10346, 10545,
+  10716, 11174, 11322, 11365, 11451, 11494, 12047, 12340, 13058, 13525,
+  13526, 13527, 13528, 13529, 13530, 13531, 13532, 13533, 13547, 13551,
+  13552, 13553, 13555, 13559, 13566, 13583, 13592, 13618, 13637, 13656,
+  13658, 13673, 13691, 13695, 13704, 13706, 13726, 13738, 13760, 13761,
+  13786, 13792, 13806, 13824, 13840, 13841, 13844, 13846, 13851, 13852,
+  13854, 13871, 13879, 13883, 13892, 13895, 13908, 13910, 13911, 13912,
+  13913, 13915, 13916, 13917, 13918, 13919, 13920, 13921, 13926, 13928,
+  13938
 
 * ISO C11 support:
 
diff --git a/manual/filesys.texi b/manual/filesys.texi
index dc570df181..04f4376ba7 100644
--- a/manual/filesys.texi
+++ b/manual/filesys.texi
@@ -257,7 +257,8 @@ are defined for its value:
 
 @vtable @code
 @item DT_UNKNOWN
-The type is unknown.  On some systems this is the only value returned.
+The type is unknown.  Only some filesystems have full support to
+return the type of the file, others might always return this value.
 
 @item DT_REG
 A regular file.