diff --git a/ChangeLog b/ChangeLog
index 23058435c4..961262d654 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,6 +58,8 @@
 	* libio/tst-wmemstream3.c (FWRITE): Rename accordingly.
 	* io/tst-fchownat.c [!defined _POSIX_CHOWN_RESTRICTED]: Act like when
 	_POSIX_CHOWN_RESTRICTED is defined to 0.
+	* io/tst-copy_file_range.c [!defined CLONE_NEWNS]: Do not include
+	<sys/mount.h>.
 
 2008-12-18  Thomas Schwinge  <tschwinge@gnu.org>
 
diff --git a/io/tst-copy_file_range.c b/io/tst-copy_file_range.c
index f1cab1252d..3d531a1937 100644
--- a/io/tst-copy_file_range.c
+++ b/io/tst-copy_file_range.c
@@ -33,7 +33,9 @@
 #include <support/temp_file.h>
 #include <support/test-driver.h>
 #include <support/xunistd.h>
-#include <sys/mount.h>
+#ifdef CLONE_NEWNS
+# include <sys/mount.h>
+#endif
 
 /* Boolean flags which indicate whether to use pointers with explicit
    output flags.  */