diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/GeneratorWriter.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/GeneratorWriter.java
index 9d184690c0..156df637fa 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/codegen/GeneratorWriter.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/GeneratorWriter.java
@@ -321,7 +321,7 @@ public abstract class GeneratorWriter<W extends GeneratorWriter<W>> {
             }
         }
         else
-            sb.append(string);
+            sb.append(string.replace(newlineString, newlineString + indent));
     }
 
     private boolean peek(String string, int i, String peek) {
diff --git a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/FlywayTest.java b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/FlywayTest.java
index f6018663d2..59d1b617b7 100644
--- a/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/FlywayTest.java
+++ b/jOOQ-examples/jOOQ-flyway-ddl-example/src/main/java/org/jooq/example/flyway/ddl/db/h2/FlywayTest.java
@@ -62,7 +62,7 @@ public class FlywayTest extends SchemaImpl {
     public final List<Table<?>> getTables() {
         return Arrays.asList(
             Author.AUTHOR,
-Book.BOOK
+            Book.BOOK
         );
     }
 }
diff --git a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultSchema.java b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultSchema.java
index 532b8f9ce4..88cfa33f81 100644
--- a/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultSchema.java
+++ b/jOOQ-examples/jOOQ-jpa-example/src/main/java/org/jooq/example/jpa/jooq/DefaultSchema.java
@@ -66,9 +66,9 @@ public class DefaultSchema extends SchemaImpl {
     public final List<Table<?>> getTables() {
         return Arrays.asList(
             Actor.ACTOR,
-Film.FILM,
-FilmActor.FILM_ACTOR,
-Language.LANGUAGE
+            Film.FILM,
+            FilmActor.FILM_ACTOR,
+            Language.LANGUAGE
         );
     }
 }
diff --git a/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/Public.kt b/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/Public.kt
index 0a176124cc..329f64ee67 100644
--- a/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/Public.kt
+++ b/jOOQ-examples/jOOQ-kotlin-example/src/main/kotlin/org/jooq/example/kotlin/db/h2/Public.kt
@@ -52,8 +52,8 @@ open class Public : SchemaImpl("PUBLIC", DefaultCatalog.DEFAULT_CATALOG) {
 
     override fun getTables(): List<Table<*>> = listOf(
         Author.AUTHOR,
-Book.BOOK,
-BookStore.BOOK_STORE,
-BookToBookStore.BOOK_TO_BOOK_STORE
+        Book.BOOK,
+        BookStore.BOOK_STORE,
+        BookToBookStore.BOOK_TO_BOOK_STORE
     )
 }