diff --git a/util.cpp b/util.cpp
index 3c0de598..a5cf5a92 100644
--- a/util.cpp
+++ b/util.cpp
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2010-2011, Intel Corporation
+  Copyright (c) 2010-2012, Intel Corporation
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -349,6 +349,8 @@ lPrint(const char *type, bool isError, SourcePos p, const char *fmt,
         }
         indent = lFindIndent(3, formattedBuf);
     }
+    // Don't indent too much with long filenames
+    indent = std::min(indent, 8);
 
     // Now that we've done all that work, see if we've already printed the
     // exact same error message.  If so, return, so we don't redundantly