diff --git a/_pkg/pylint.conf b/_pkg/pylint.conf
index db8d3ff..9de7af8 100644
--- a/_pkg/pylint.conf
+++ b/_pkg/pylint.conf
@@ -14,7 +14,7 @@ profile=no
 # Add <file or directory> to the black list. It should be a base name, not a
 # path. You may set this option multiple times.
 ignore=
-    .svn, _tdi_impl.so
+    .git, .svn, _tdi_impl.so
 
 # Pickle collected data for later comparisons.
 persistent=no
diff --git a/_setup/py2/data.py b/_setup/py2/data.py
index 47dc138..9cf04e1 100644
--- a/_setup/py2/data.py
+++ b/_setup/py2/data.py
@@ -97,7 +97,7 @@ class Data(object):
         result = []
         for filename in files.files:
             _, elems = splitpath(filename)
-            if '.svn' in elems:
+            if '.svn' in elems or '.git' in elems:
                 continue
             result.append(filename)
         return cls(result, **kwargs)
diff --git a/_setup/py2/setup.py b/_setup/py2/setup.py
index 327319a..fd86f62 100644
--- a/_setup/py2/setup.py
+++ b/_setup/py2/setup.py
@@ -182,7 +182,7 @@ def find_packages(manifest):
         sep = _os.path.join('1', '2')[1:-1]
     for root in collect:
         for dirpath, _, filenames in _shell.walk(_os.path.join(lib, root)):
-            if dirpath.find('.svn') >= 0:
+            if dirpath.find('.svn') >= 0 or dirpath.find('.git') >= 0:
                 continue
             if '__init__.py' in filenames:
                 packages[
diff --git a/_setup/py2/shell.py b/_setup/py2/shell.py
index e49d529..4eafb9c 100644
--- a/_setup/py2/shell.py
+++ b/_setup/py2/shell.py
@@ -399,7 +399,7 @@ except AttributeError:
             yield top, dirs, nondirs
 
 
-def files(base, wildcard='[!.]*', recursive=1, prune=('.svn', 'CVS')):
+def files(base, wildcard='[!.]*', recursive=1, prune=('.git', '.svn', 'CVS')):
     """ Determine a filelist """
     for dirpath, dirnames, filenames in walk(native(base)):
         for item in prune:
@@ -425,7 +425,7 @@ def files(base, wildcard='[!.]*', recursive=1, prune=('.svn', 'CVS')):
         dirnames.sort()
 
 
-def dirs(base, wildcard='[!.]*', recursive=1, prune=('.svn', 'CVS')):
+def dirs(base, wildcard='[!.]*', recursive=1, prune=('.git', '.svn', 'CVS')):
     """ Determine a filelist """
     for dirpath, dirnames, filenames in walk(native(base)):
         for item in prune:
diff --git a/_setup/py3/data.py b/_setup/py3/data.py
index aa0b089..d422173 100644
--- a/_setup/py3/data.py
+++ b/_setup/py3/data.py
@@ -97,7 +97,7 @@ class Data(object):
         result = []
         for filename in files.files:
             _, elems = splitpath(filename)
-            if '.svn' in elems:
+            if '.svn' in elems or '.git' in elems:
                 continue
             result.append(filename)
         return cls(result, **kwargs)
diff --git a/_setup/py3/setup.py b/_setup/py3/setup.py
index fae75ff..e28f000 100644
--- a/_setup/py3/setup.py
+++ b/_setup/py3/setup.py
@@ -183,7 +183,7 @@ def find_packages(manifest):
         sep = _os.path.join('1', '2')[1:-1]
     for root in collect:
         for dirpath, _, filenames in _shell.walk(_os.path.join(lib, root)):
-            if dirpath.find('.svn') >= 0:
+            if dirpath.find('.svn') >= 0 or dirpath.find('.git') >= 0:
                 continue
             if '__init__.py' in filenames:
                 packages[
diff --git a/_setup/py3/shell.py b/_setup/py3/shell.py
index 97fb647..a40c85c 100644
--- a/_setup/py3/shell.py
+++ b/_setup/py3/shell.py
@@ -272,7 +272,7 @@ def spawn(*argv, **kwargs):
 walk = _os.walk
 
 
-def files(base, wildcard='[!.]*', recursive=1, prune=('.svn', 'CVS')):
+def files(base, wildcard='[!.]*', recursive=1, prune=('.git', '.svn', 'CVS')):
     """ Determine a filelist """
     for dirpath, dirnames, filenames in walk(native(base)):
         for item in prune:
@@ -298,7 +298,7 @@ def files(base, wildcard='[!.]*', recursive=1, prune=('.svn', 'CVS')):
         dirnames.sort()
 
 
-def dirs(base, wildcard='[!.]*', recursive=1, prune=('.svn', 'CVS')):
+def dirs(base, wildcard='[!.]*', recursive=1, prune=('.git', '.svn', 'CVS')):
     """ Determine a filelist """
     for dirpath, dirnames, filenames in walk(native(base)):
         for item in prune: