diff --git a/src/libsyntax/errors/emitter.rs b/src/libsyntax/errors/emitter.rs
index 7c9985d7d233..2ba003c5eafb 100644
--- a/src/libsyntax/errors/emitter.rs
+++ b/src/libsyntax/errors/emitter.rs
@@ -238,7 +238,7 @@ impl EmitterWriter {
                 self.first = false;
             } else {
                 if !self.old_school {
-                    write!(self.dst, "\n")?;
+                    write!(self.dst, "\n\n")?;
                 }
             }
         }
diff --git a/src/libsyntax/errors/snippet/mod.rs b/src/libsyntax/errors/snippet/mod.rs
index 188e676e7dff..414da87b749c 100644
--- a/src/libsyntax/errors/snippet/mod.rs
+++ b/src/libsyntax/errors/snippet/mod.rs
@@ -478,6 +478,13 @@ impl FileInfo {
                         }],
                         kind: RenderedLineKind::PrimaryFileName,
                     });
+                    output.push(RenderedLine {
+                        text: vec![StyledString {
+                            text: "".to_string(),
+                            style: Style::FileNameStyle,
+                        }],
+                        kind: RenderedLineKind::Annotations,
+                    });
                 }
                 None => {
                     output.push(RenderedLine {