diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
index 560488fff4..745bd6e498 100644
--- a/src/bin/psql/mainloop.c
+++ b/src/bin/psql/mainloop.c
@@ -136,7 +136,9 @@ MainLoop(PsqlSettings *pset, FILE *source)
 		if (line == NULL || (!pset->cur_cmd_interactive && *line == '\0'))
 		{
 			if (GetVariableBool(pset->vars, "echo") && !GetVariableBool(pset->vars, "quiet"))
-				puts("EOF");
+				puts("EOF\n");
+			else
+				puts(""); /* put out newline */
 			eof = true;
 			continue;
 		}