diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index 7481696a584..1081b28db8f 100755
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -224,6 +224,9 @@ sub pre_indent
 {
 	my $source = shift;
 
+	## Ensure file ends with a newline (pg_bsd_indent messes up otherwise)
+	$source .= "\n" unless substr($source, -1) eq "\n";
+
 	## Comments
 
 	# Convert // comments to /* */