diff --git a/src/songinfo/songinfotextview.cpp b/src/songinfo/songinfotextview.cpp
index 94b44f31d..5229a4c69 100644
--- a/src/songinfo/songinfotextview.cpp
+++ b/src/songinfo/songinfotextview.cpp
@@ -79,9 +79,12 @@ void SongInfoTextView::contextMenuEvent(QContextMenuEvent* e) {
 void SongInfoTextView::SetHtml(const QString& html) {
   QString copy(html.trimmed());
 
-  // Simplify newlines, and convert them to <p>
-  copy.replace(QRegExp("[\\r\\n]+"), "\n");
-  copy.replace(QRegExp("([^>])[\\t ]*\\n"), "\\1<p>");
+  // Simplify newlines
+  copy.replace(QRegExp("\\r\\n?"), "\n");
+
+  // Convert two or more newlines to <p>, convert single newlines to <br>
+  copy.replace(QRegExp("([^>])([\\t ]*\\n){2,}"), "\\1<p>");
+  copy.replace(QRegExp("([^>])[\\t ]*\\n"), "\\1<br>");
 
   // Strip any newlines from the end
   copy.replace(QRegExp("((<\\s*br\\s*/?\\s*>)|(<\\s*/?\\s*p\\s*/?\\s*>))+$"),
diff --git a/src/songinfo/ultimatelyricslyric.cpp b/src/songinfo/ultimatelyricslyric.cpp
index 8f8575868..feafd2227 100644
--- a/src/songinfo/ultimatelyricslyric.cpp
+++ b/src/songinfo/ultimatelyricslyric.cpp
@@ -25,9 +25,12 @@ UltimateLyricsLyric::UltimateLyricsLyric(QObject* parent)
 void UltimateLyricsLyric::SetHtml(const QString& html) {
   QString copy(html.trimmed());
 
-  // Simplify newlines, and convert them to <p>
-  copy.replace(QRegExp("[\\r\\n]+"), "\n");
-  copy.replace(QRegExp("([^>])[\\t ]*\\n"), "\\1<p>");
+  // Simplify newlines
+  copy.replace(QRegExp("\\r\\n?"), "\n");
+
+  // Convert two or more newlines to <p>, convert single newlines to <br>
+  copy.replace(QRegExp("([^>])([\\t ]*\\n){2,}"), "\\1<p>");
+  copy.replace(QRegExp("([^>])[\\t ]*\\n"), "\\1<br>");
 
   // Strip any newlines from the end
   copy.replace(QRegExp("((<\\s*br\\s*/?\\s*>)|(<\\s*/?\\s*p\\s*/?\\s*>))+$"),