diff --git a/src/more-infos/more-info-content.html b/src/more-infos/more-info-content.html
index 1c9dc8b2fe..1e7a028c72 100644
--- a/src/more-infos/more-info-content.html
+++ b/src/more-infos/more-info-content.html
@@ -9,6 +9,7 @@
 <link rel='import' href='more-info-light.html'>
 <link rel='import' href='more-info-media_player.html'>
 <link rel='import' href='more-info-camera.html'>
+<link rel='import' href='more-info-updater.html'>
 
 <dom-module id='more-info-content'>
   <style>
diff --git a/src/more-infos/more-info-content.js b/src/more-infos/more-info-content.js
index b4da8a73f2..8fda0506d5 100644
--- a/src/more-infos/more-info-content.js
+++ b/src/more-infos/more-info-content.js
@@ -10,6 +10,7 @@ require('./more-info-script');
 require('./more-info-light');
 require('./more-info-media_player');
 require('./more-info-camera');
+require('./more-info-updater');
 
 export default Polymer({
   is: 'more-info-content',
diff --git a/src/more-infos/more-info-updater.html b/src/more-infos/more-info-updater.html
new file mode 100644
index 0000000000..f22109953c
--- /dev/null
+++ b/src/more-infos/more-info-updater.html
@@ -0,0 +1,60 @@
+<link rel="import" href="../../bower_components/polymer/polymer.html">
+<link rel="import" href="../../bower_components/paper-button/paper-button.html">
+
+<dom-module id="more-info-updater">
+  <style>
+    .data-entry .value {
+      max-width: 200px;
+    }
+    .center {
+      text-align: center;
+    }
+    .centered {
+      margin: auto;
+    }
+    .divider {
+      padding: 5px;
+    }
+    .link {
+      color: #03A9F4;
+    }
+  </style>
+  <template>
+    <div class='layout vertical'>
+
+      <div class='horizontal layout center'>
+        <paper-button raised class='centered link' raised on-tap="updateTapped">
+          Update
+        </paper-button>
+
+        <paper-button raised class='centered link' on-tap="linkTapped">
+          View on GitHub
+        </paper-button>
+      </div>
+
+      <div class='divider'></div>
+
+      <div class='data-entry layout justified horizontal'>
+        <div class='key'>Updated On:</div>
+        <div class='value'>[[stateObj.attributes.date]]</div>
+      </div>
+
+      <div class='data-entry layout justified vertical' hidden='[[!stateObj.attributes.message]]'>
+        <div class='key'>Release Notes:</div>
+        <div class='centered'>[[stateObj.attributes.message]]<br /></div>
+      </div>
+
+      <div class='divider'></div>
+
+      <div class='data-entry layout justified vertical'>
+        <div class='key'>Remote SHA:</div>
+        <div class='centered'>[[stateObj.attributes.remote_sha]]<br /></div>
+      </div>
+
+      <div class='data-entry layout justified vertical'>
+        <div class='key'>Local SHA:</div>
+        <div class='centered'>[[stateObj.attributes.local_sha]]<br /></div>
+      </div>
+    </div>
+  </template>
+</dom-module>
diff --git a/src/more-infos/more-info-updater.js b/src/more-infos/more-info-updater.js
new file mode 100644
index 0000000000..7c40f78c9a
--- /dev/null
+++ b/src/more-infos/more-info-updater.js
@@ -0,0 +1,20 @@
+import { util } from 'home-assistant-js';
+import { serviceActions } from 'home-assistant-js';
+
+export default Polymer({
+  is: 'more-info-updater',
+
+  properties: {
+    stateObj: {
+      type: Object,
+    },
+  },
+
+  updateTapped: function(stateObj) {
+    serviceActions.callService('updater', 'update', {})
+  },
+
+  linkTapped: function(stateObj) {
+    window.open(this.stateObj.attributes.link, '_blank');
+  },
+});
diff --git a/src/util/domain-icon.js b/src/util/domain-icon.js
index 312ce1b500..71d05adf26 100644
--- a/src/util/domain-icon.js
+++ b/src/util/domain-icon.js
@@ -51,6 +51,13 @@ export default function domainIcon(domain, state) {
     case 'scene':
       return 'social:pages';
 
+    case 'updater':
+      if(state == "True") {
+        return 'icons:cloud-download';
+      } else {
+        return 'icons:cloud-done';
+      }
+
     default:
       return "bookmark";
   }
diff --git a/src/util/state-more-info-type.js b/src/util/state-more-info-type.js
index 6cf865e02a..4c6b2f8ead 100644
--- a/src/util/state-more-info-type.js
+++ b/src/util/state-more-info-type.js
@@ -1,5 +1,6 @@
 const DOMAINS_WITH_MORE_INFO = [
-  'light', 'group', 'sun', 'configurator', 'thermostat', 'script', 'media_player', 'camera'
+  'light', 'group', 'sun', 'configurator', 'thermostat', 'script',
+  'media_player', 'camera', 'updater'
 ];
 
 export default function stateMoreInfoType(state) {