diff --git a/pkgs/os-specific/gnu/mach/default.nix b/pkgs/os-specific/gnu/mach/default.nix
index 7949f5e8e45..95b3921ee2b 100644
--- a/pkgs/os-specific/gnu/mach/default.nix
+++ b/pkgs/os-specific/gnu/mach/default.nix
@@ -16,7 +16,12 @@ stdenv.mkDerivation ({
     inherit rev;
   };
 
-  configureFlags = "--build=i586-pc-gnu";
+  configureFlags =
+       stdenv.lib.optional headersOnly "--build=i586-pc-gnu"  # cheat
+
+    # Always enable dependency tracking.  See
+    # <http://lists.gnu.org/archive/html/bug-hurd/2010-05/msg00137.html>.
+    ++ [ "--enable-dependency-tracking" ];
 
   buildNativeInputs = [ autoconf automake texinfo ]
     ++ stdenv.lib.optional (mig != null) mig;