diff --git a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/AbstractTychoPackagingMojo.java b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/AbstractTychoPackagingMojo.java
index a87e658e36..59fb2e122d 100644
--- a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/AbstractTychoPackagingMojo.java
+++ b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/AbstractTychoPackagingMojo.java
@@ -103,6 +103,10 @@ protected FileSet getFileSet(File basedir, List<String> includes, List<String> e
         }
         if (useDefaultExcludes) {
             allExcludes.addAll(Arrays.asList(AbstractScanner.DEFAULTEXCLUDES));
+			// keep ignoring the following files after
+			// https://github.com/codehaus-plexus/plexus-utils/pull/174
+			allExcludes.add("**/.gitignore");
+			allExcludes.add("**/.gitattributes");
         }
 
         fileSet.setExcludes(allExcludes.toArray(new String[allExcludes.size()]));
diff --git a/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/SourceFeatureMojo.java b/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/SourceFeatureMojo.java
index 36cfcb7863..57f419ff8d 100644
--- a/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/SourceFeatureMojo.java
+++ b/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/SourceFeatureMojo.java
@@ -662,6 +662,9 @@ protected FileSet getFileSet(File basedir, List<String> includes, List<String> e
         }
         if (useDefaultExcludes) {
             allExcludes.addAll(Arrays.asList(AbstractScanner.DEFAULTEXCLUDES));
+            // keep ignoring the following files after https://github.com/codehaus-plexus/plexus-utils/pull/174
+            allExcludes.add("**/.gitignore");
+            allExcludes.add("**/.gitattributes");
         }
 
         fileSet.setExcludes(allExcludes.toArray(new String[allExcludes.size()]));