diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractExtensionXmlParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractExtensionXmlParser.php
index 3c45026d80306888d8004024941bec4ad4e2584a..85960adb98cf398c6fb6b06e60ff7c11980172ea 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractExtensionXmlParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractExtensionXmlParser.php
@@ -389,9 +389,9 @@ abstract class AbstractExtensionXmlParser extends AbstractXmlParser
         // resetting at least class property "version" is mandatory
         // as we need to do some magic in regards to
         // an extension's and version's child node "downloadcounter"
-        $this->version = ($this->title = ($this->versionDownloadCounter = ($this->description = ($this->state = ($this->reviewstate = ($this->category = ($this->lastuploaddate = ($this->uploadcomment = ($this->dependencies = ($this->authorname = ($this->authoremail = ($this->authorcompany = ($this->ownerusername = ($this->t3xfilemd5 = null))))))))))))));
+        $this->version = $this->title = $this->versionDownloadCounter = $this->description = $this->state = $this->reviewstate = $this->category = $this->lastuploaddate = $this->uploadcomment = $this->dependencies = $this->authorname = $this->authoremail = $this->authorcompany = $this->ownerusername = $this->t3xfilemd5 = null;
         if ($resetAll) {
-            $this->extensionKey = ($this->extensionDownloadCounter = null);
+            $this->extensionKey = $this->extensionDownloadCounter = null;
         }
     }
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php
index c8ceccf492fcda62404c74556599412c248ebe85..b9069398de8298d1de5732ba39fb004c18020039 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php
@@ -153,7 +153,7 @@ class ExtensionXmlPushParser extends AbstractExtensionXmlParser
                     $this->title = $data;
                     break;
                 case 'description':
-                    $this->description = $data;
+                    $this->description .= $data;
                     break;
                 case 'state':
                     $this->state = $data;
@@ -168,7 +168,7 @@ class ExtensionXmlPushParser extends AbstractExtensionXmlParser
                     $this->lastuploaddate = $data;
                     break;
                 case 'uploadcomment':
-                    $this->uploadcomment = $data;
+                    $this->uploadcomment .= $data;
                     break;
                 case 'dependencies':
                     $this->dependencies = $this->convertDependencies($data);
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerShowVersionsSingleLine.html b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerShowVersionsSingleLine.html
index 24b61cb6f0a71290d243e4bd1d4f311078399452..da269437a01622e5b02dfc6ade6e992a82872c45 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerShowVersionsSingleLine.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Partials/List/TerShowVersionsSingleLine.html
@@ -9,11 +9,11 @@
 	{extension.version}
 </td>
 <td>
-	{extension.updateComment}
+	<f:format.nl2br>{extension.updateComment}</f:format.nl2br>
 </td>
 <td>
 	<f:format.date>{extension.lastUpdated}</f:format.date>
 </td>
 <td class="{extension.stateString}">
 	{extension.stateString}
-</td>
\ No newline at end of file
+</td>
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/ShowAllVersions.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/ShowAllVersions.html
index 173ab3d4cdd8cf88a3cf2f54cc5cdb942e0ae1c8..bb5d58fe7accd668c272c9ff46c9758ca6237a45 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/ShowAllVersions.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/ShowAllVersions.html
@@ -15,7 +15,7 @@
 
 <f:section name="content">
 	<f:if condition="{currentVersion}">
-		<p>{currentVersion.description}</p>
+		<p><f:format.nl2br>{currentVersion.description}</f:format.nl2br></p>
 
 		<table cellpadding="0" cellspacing="0" class="currentVersionInfo">
 			<tr class="ter-ext-single-info-key">
diff --git a/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js b/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js
index 75cbd7fe4f58723dfd73d38eac803c246f4e46ca..584a78272e58b10763893c68cf5c5ec52a4dedcb 100644
--- a/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js
+++ b/typo3/sysext/extensionmanager/Resources/Public/JavaScript/Main.js
@@ -247,7 +247,8 @@ define([
 		message += '<form>';
 		var i = 0;
 		$.each(data.updateComments, function(version, comment) {
-			message += '<h3><input type="radio" ' + (i == 0 ? 'checked="checked" ' : '') + 'name="version" value="' + version + '" /> ' + version + '</h3>';
+			comment = comment.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1<br />$2');
+			message += '<h3><input type="radio" ' + (i === 0 ? 'checked="checked" ' : '') + 'name="version" value="' + version + '" /> ' + version + '</h3>';
 			message += '<div>' + comment + '</div>';
 			i++;
 		});