diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/JavaWriter.java b/jOOQ-codegen/src/main/java/org/jooq/util/JavaWriter.java
index d267e480c9..07d7fcf5cf 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/JavaWriter.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/JavaWriter.java
@@ -118,7 +118,7 @@ public class JavaWriter extends GeneratorWriter<JavaWriter> {
         StringBuilder importString = new StringBuilder();
         String pkg = "";
 
-        Matcher m = Pattern.compile("(?s:^.*?\\Rpackage\\s+(.*?);?\\R.*?$)").matcher(string);
+        Matcher m = Pattern.compile("(?s:^.*?[\\r\\n]+package\\s+(.*?);?[\\r\\n]+.*?$)").matcher(string);
         if (m.find())
             pkg = m.group(1);