diff -urN coreutils-6.11-orig/tests/mkdir/selinux coreutils-6.11/tests/mkdir/selinux
--- coreutils-6.11-orig/tests/mkdir/selinux	2008-04-19 23:34:23.000000000 +0200
+++ coreutils-6.11/tests/mkdir/selinux	2008-04-22 13:23:50.000000000 +0200
@@ -38,6 +28,7 @@
 # successfully, in spite of the invalid context string.
 
 . $srcdir/test-lib.sh
+require_selinux_
 
 c=invalid-selinux-context
 msg="failed to set default file creation context to \`$c':"
diff -urNp coreutils-6.11-orig/tests/test-lib.sh coreutils-6.11/tests/test-lib.sh
--- coreutils-6.11-orig/tests/test-lib.sh	2008-04-19 23:34:23.000000000 +0200
+++ coreutils-6.11/tests/test-lib.sh	2008-04-24 14:18:59.000000000 +0200
@@ -97,8 +97,8 @@ skip_if_()
 
 require_selinux_()
 {
-  case `ls -Zd .` in
-    '? .'|'unlabeled .')
+  case `ls --scontext -d . | cut -f1 -d" "` in
+    '?'|'unlabeled')
       skip_test_ "this system (or maybe just" \
         "the current file system) lacks SELinux support"
     ;;
diff -urNp coreutils-7.1-orig/gnulib-tests/test-getaddrinfo.c coreutils-7.1/gnulib-tests/test-getaddrinfo.c
--- coreutils-7.1-orig/gnulib-tests/test-getaddrinfo.c	2009-01-27 21:33:19.000000000 +0100
+++ coreutils-7.1/gnulib-tests/test-getaddrinfo.c	2009-02-25 13:52:59.000000000 +0100
@@ -36,6 +36,8 @@
 # define dbgprintf if (0) printf
 #endif
 
+static int skip = 0;
+
 /* BeOS does not have AF_UNSPEC.  */
 #ifndef AF_UNSPEC
 # define AF_UNSPEC 0
@@ -52,6 +54,9 @@ int simple (char *host, char *service)
   struct addrinfo *ai0, *ai;
   int res;
 
+  if (skip)
+    return 0;
+
   dbgprintf ("Finding %s service %s...\n", host, service);
 
   /* This initializes "hints" but does not use it.  Is there a reason
@@ -72,8 +77,12 @@ int simple (char *host, char *service)
 	 in-law's farm. */
       if (res == EAI_AGAIN)
 	{
-	  fprintf (stderr, "skipping getaddrinfo test: no network?\n");
-	  return 77;
+	if (!skip)
+	  {
+	    skip++;
+	    fprintf (stderr, "skipping getaddrinfo test: no network?\n");
+	    return 77;
+	  }
 	}
       /* IRIX reports EAI_NONAME for "https".  Don't fail the test
 	 merely because of this.  */
diff -urNp coreutils-7.1-orig/src/ls.c coreutils-7.1/src/ls.c
--- coreutils-7.1-orig/src/ls.c	2009-02-25 13:23:59.000000000 +0100
+++ coreutils-7.1/src/ls.c	2009-02-25 13:25:20.000000000 +0100
@@ -38,10 +38,6 @@
 #include <config.h>
 #include <sys/types.h>
 
-#ifdef HAVE_CAP
-# include <sys/capability.h>
-#endif
-
 #if HAVE_TERMIOS_H
 # include <termios.h>
 #endif
@@ -84,6 +80,10 @@
 #include "system.h"
 #include <fnmatch.h>
 
+#ifdef HAVE_CAP
+# include <sys/capability.h>
+#endif
+
 #include "acl.h"
 #include "argmatch.h"
 #include "dev-ino.h"