diff --git a/maintenance/generateSchemaSql.php b/maintenance/generateSchemaSql.php
index 0c555db058e..75f32852ce7 100644
--- a/maintenance/generateSchemaSql.php
+++ b/maintenance/generateSchemaSql.php
@@ -69,6 +69,7 @@ class GenerateSchemaSql extends Maintenance {
 			$schemaBuilder->addTable( $table );
 		}
 		$sql = "-- This file is automatically generated using maintenance/generateSchemaSql.php.\n" .
+			"-- Source: $jsonFile\n" .
 			"-- Do not modify this file directly.\n" .
 			"-- See https://www.mediawiki.org/wiki/Manual:Schema_changes\n";
 
@@ -78,6 +79,20 @@ class GenerateSchemaSql extends Maintenance {
 			$sql = $sql . implode( ";\n\n", $tables ) . ';';
 			$sql = ( new SqlFormatter( new NullHighlighter() ) )->format( $sql );
 		}
+		// Until the linting issue is resolved
+		// https://github.com/doctrine/sql-formatter/issues/53
+		$sql = str_replace( "\n/*_*/\n", " /*_*/", $sql );
+		$sql = str_replace( "; CREATE ", ";\nCREATE ", $sql );
+		$sql = str_replace(
+			"\n" . '/*$wgDBTableOptions*/' . ";",
+			' /*$wgDBTableOptions*/;' . "\n",
+			$sql
+		);
+		$sql = str_replace(
+			"\n" . '/*$wgDBTableOptions*/' . "\n;",
+			' /*$wgDBTableOptions*/;' . "\n",
+			$sql
+		);
 
 		file_put_contents( $sqlFile, $sql );
 	}
diff --git a/maintenance/postgres/tables-generated.sql b/maintenance/postgres/tables-generated.sql
index 978834387d5..c59e4293463 100644
--- a/maintenance/postgres/tables-generated.sql
+++ b/maintenance/postgres/tables-generated.sql
@@ -1,3 +1,4 @@
 -- This file is automatically generated using maintenance/generateSchemaSql.php.
+-- Source: maintenance/tables.json
 -- Do not modify this file directly.
 -- See https://www.mediawiki.org/wiki/Manual:Schema_changes
diff --git a/maintenance/sqlite/tables-generated.sql b/maintenance/sqlite/tables-generated.sql
index 978834387d5..c59e4293463 100644
--- a/maintenance/sqlite/tables-generated.sql
+++ b/maintenance/sqlite/tables-generated.sql
@@ -1,3 +1,4 @@
 -- This file is automatically generated using maintenance/generateSchemaSql.php.
+-- Source: maintenance/tables.json
 -- Do not modify this file directly.
 -- See https://www.mediawiki.org/wiki/Manual:Schema_changes
diff --git a/maintenance/tables-generated.sql b/maintenance/tables-generated.sql
index 978834387d5..c59e4293463 100644
--- a/maintenance/tables-generated.sql
+++ b/maintenance/tables-generated.sql
@@ -1,3 +1,4 @@
 -- This file is automatically generated using maintenance/generateSchemaSql.php.
+-- Source: maintenance/tables.json
 -- Do not modify this file directly.
 -- See https://www.mediawiki.org/wiki/Manual:Schema_changes