diff --git a/hg-fast-export.py b/hg-fast-export.py
index d0438af4..79fe65fd 100755
--- a/hg-fast-export.py
+++ b/hg-fast-export.py
@@ -161,6 +161,10 @@ def export_file_contents(ctx,manifest,files,hgtags,repourl,revnode,ignoreSub,enc
     if not hgtags and file == ".hgtags":
       sys.stderr.write('Skip %s\n' % (file))
       continue
+    # Skip .git files. They only get us in trouble.
+    if '/.git' in file:
+      sys.stderr.write('Skip %s\n' % (file))
+      continue
     d=ctx.filectx(file).data()
     if encoding:
       filename=file.decode(encoding).encode('utf8')