diff --git a/src/mail_templates/box_update_available.ejs b/src/mail_templates/box_update_available.ejs
index bec5cf6d4..1b35851d6 100644
--- a/src/mail_templates/box_update_available.ejs
+++ b/src/mail_templates/box_update_available.ejs
@@ -33,8 +33,8 @@ your Cloudron
 
 <h5>Changelog:</h5>
 <ul>
-<% for (var i = 0; i < changelog.length; i++) { %>
-    <li><%- changelog[i] %></li>
+<% for (var i = 0; i < changelogHTML.length; i++) { %>
+    <li><%- changelogHTML[i] %></li>
 <% } %>
 </ul>
 
diff --git a/src/mailer.js b/src/mailer.js
index cbaef7da6..4b5c3d67a 100644
--- a/src/mailer.js
+++ b/src/mailer.js
@@ -44,6 +44,7 @@ var assert = require('assert'),
     path = require('path'),
     safe = require('safetydance'),
     settings = require('./settings.js'),
+    showdown = require('showdown'),
     smtpTransport = require('nodemailer-smtp-transport'),
     users = require('./user.js'),
     util = require('util'),
@@ -399,11 +400,14 @@ function boxUpdateAvailable(newBoxVersion, changelog) {
                 cloudronName = 'Cloudron';
             }
 
+            var converter = new showdown.Converter();
+
             var templateData = {
                 fqdn: config.fqdn(),
                 webadminUrl: config.adminOrigin(),
                 newBoxVersion: newBoxVersion,
                 changelog: changelog,
+                changelogHTML: changelog.map(function (e) { return converter.makeHtml(e); }),
                 cloudronName: cloudronName,
                 cloudronAvatarUrl: config.adminOrigin() + '/api/v1/cloudron/avatar'
             };