diff --git a/app.js b/app.js
index a5420b38fefa9dfa62c22da19c4c9d825952f028..9bb1d85c41869cf8adf645adcf7bdbd1b9c618d9 100644
--- a/app.js
+++ b/app.js
@@ -859,11 +859,22 @@ var firmwarewizard = function() {
       var branches = ObjectValues(config.directories)
         .filter(function(value, index, self) { return self.indexOf(value) === index; });
 
-      $('#currentVersions').innerHTML = branches.reduce(function(ret, branch, i) {
+      $('#currentVersions').innerText = '';
+      if (config.changelog !== undefined) {
+        var a = document.createElement('a');
+        a.href = config.changelog;
+        a.innerText = 'CHANGELOG';
+        $('#currentVersions').appendChild(a);
+        var text = document.createTextNode(' // ');
+        $('#currentVersions').appendChild(text);
+      }
+
+      var versionStr = branches.reduce(function(ret, branch, i) {
         ret += ((i === 0) ? '' : ' // ') + branch;
         ret += (branch in app.currentVersions) ?  (': '  + prettyPrintVersion(app.currentVersions[branch])) : '';
         return ret;
       }, '');
+      $('#currentVersions').appendChild(document.createTextNode(versionStr));
     }
     updateCurrentVersions();
   }
diff --git a/config_template.js b/config_template.js
index 2398022222b0c22ec173af34e8b03ff98f62b305..01f2360f92bf4393d3560b03e614b77c78a44080 100644
--- a/config_template.js
+++ b/config_template.js
@@ -28,5 +28,8 @@ var config = {
     './images/gluon-factory-example.html': 'stable',
     './images/gluon-sysupgrade-example.html': 'stable'
   },
-  preview_pictures: 'pictures/'
+  // path to preview pictures directory
+  preview_pictures: 'pictures/',
+  // link to changelog
+  changelog: 'CHANGELOG.html'
 };