diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index a56b4834a..767eac6e7 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -8,6 +8,9 @@ See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for
 details on the presubmit API built into depot_tools.
 """
 
+import fnmatch
+import os
+
 
 def CommonChecks(input_api, output_api, tests_to_black_list):
   results = []
@@ -19,6 +22,16 @@ def CommonChecks(input_api, output_api, tests_to_black_list):
       r'^site-packages-py[0-9]\.[0-9][\/\\].+',
       r'^svn_bin[\/\\].+',
       r'^testing_support[\/\\]_rietveld[\/\\].+']
+  if os.path.exists('.gitignore'):
+    with open('.gitignore') as fh:
+      lines = [l.strip() for l in fh.readlines()]
+      black_list.extend([fnmatch.translate(l) for l in lines if
+                         l and not l.startswith('#')])
+  if os.path.exists('.git/info/exclude'):
+    with open('.git/info/exclude') as fh:
+      lines = [l.strip() for l in fh.readlines()]
+      black_list.extend([fnmatch.translate(l) for l in lines if
+                         l and not l.startswith('#')])
   disabled_warnings = [
     'R0401',  # Cyclic import
     'W0613',  # Unused argument
diff --git a/third_party/pylint/reporters/text.py b/third_party/pylint/reporters/text.py
index 269a519fe..032df6b16 100644
--- a/third_party/pylint/reporters/text.py
+++ b/third_party/pylint/reporters/text.py
@@ -47,10 +47,10 @@ class TextReporter(BaseReporter):
 
     def add_message(self, msg_id, location, msg):
         """manage message of different type and in the context of path"""
-        module, obj, line, col_offset = location[1:]
+        path, module, obj, line, col_offset = location
         if module not in self._modules:
             if module:
-                self.writeln('************* Module %s' % module)
+                self.writeln('************* Module %s' % (path if path else module))
                 self._modules[module] = 1
             else:
                 self.writeln('************* %s' % module)