diff --git a/java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/FileHeaderChecker.java b/java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/FileHeaderChecker.java
index 807eb6d2ff95..de25d9bb03f2 100644
--- a/java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/FileHeaderChecker.java
+++ b/java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/FileHeaderChecker.java
@@ -54,6 +54,7 @@ public class FileHeaderChecker {
     TIntObjectHashMap<String> offsetToProperty = new TIntObjectHashMap<String>();
     String templateText = template.getText().trim();
     String regex = templateToRegex(templateText, offsetToProperty);
+    regex = StringUtil.replace(regex, "with", "(?:with|by)");
     regex = ".*("+regex+").*";
     String fileText = file.getText();
     Pattern pattern = Pattern.compile(regex, Pattern.DOTALL);
diff --git a/java/java-tests/testData/inspection/defaultFileTemplateUsage/defaultFile/expected.xml b/java/java-tests/testData/inspection/defaultFileTemplateUsage/defaultFile/expected.xml
index 45862611acd6..8a0d3d38518e 100644
--- a/java/java-tests/testData/inspection/defaultFileTemplateUsage/defaultFile/expected.xml
+++ b/java/java-tests/testData/inspection/defaultFileTemplateUsage/defaultFile/expected.xml
@@ -8,7 +8,14 @@
   <description>Default File template</description>
 </problem>
 
-<problem>
+  <problem>
+    <file>X2.java</file>
+    <line>4</line>
+    <problem_class>Default File Template Usage</problem_class>
+    <description>Default File template</description>
+  </problem>
+
+  <problem>
   <file>X.java</file>
   <line>17</line>
   <package>x</package>
diff --git a/java/java-tests/testData/inspection/defaultFileTemplateUsage/defaultFile/src/x/X2.java b/java/java-tests/testData/inspection/defaultFileTemplateUsage/defaultFile/src/x/X2.java
new file mode 100644
index 000000000000..2c43737e9a7a
--- /dev/null
+++ b/java/java-tests/testData/inspection/defaultFileTemplateUsage/defaultFile/src/x/X2.java
@@ -0,0 +1,12 @@
+package x;
+import java.io.*;
+
+/**
+ * Created with IntelliJ IDEA.
+ * User: Alexey
+ * Date: 02.12.2005
+ * Time: 0:24:14
+ * To change this template use File | Settings | File Templates.
+ */
+public class X2 {
+}