diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 2de499f943e..85c19932550 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -69,6 +69,8 @@ in
   };
 
   # Propagate some build inputs because of header file dependencies.
+  # Note: most of these are in Requires.private, so maybe builder.sh
+  # should propagate them automatically.
   libXt = attrs: attrs // {
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
     propagatedBuildInputs = [ xorg.libSM ];
@@ -82,6 +84,10 @@ in
     propagatedBuildInputs = [ xorg.libXfixes ];
   };
   
+  libXaw = attrs: attrs // {
+    propagatedBuildInputs = [ xorg.libXmu ];
+  };
+  
   libXft = attrs: attrs // {
     buildInputs = attrs.buildInputs ++ [ xorg.xproto xorg.libX11
         xorg.renderproto ];