diff --git a/Gruntfile.js b/Gruntfile.js
index e5fa9e0c..b1ad0b7f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -76,6 +76,13 @@ module.exports = function(grunt) {
                 expand: true,
                 flatten: true
             },
+            'desktop_app_content': {
+                cwd: 'electron/',
+                src: '**',
+                dest: 'tmp/desktop/app/',
+                expand: true,
+                nonull: true
+            },
             'desktop_osx': {
                 src: 'tmp/desktop/KeeWeb.dmg',
                 dest: 'dist/desktop/KeeWeb.mac.dmg',
@@ -141,12 +148,16 @@ module.exports = function(grunt) {
         'string-replace': {
             manifest: {
                 options: {
-                    replacements: [{
-                        pattern: '# YYYY-MM-DD:v0.0.0',
-                        replacement: '# ' + dt + ':v' + pkg.version
-                    }]
+                    replacements: [
+                        { pattern: '# YYYY-MM-DD:v0.0.0', replacement: '# ' + dt + ':v' + pkg.version },
+                        { pattern: 'vElectron', replacement: electronVersion }
+                    ]
                 },
                 files: { 'dist/manifest.appcache': 'app/manifest.appcache' }
+            },
+            'desktop_html': {
+                options: { replacements: [{ pattern: ' manifest="manifest.appcache"', replacement: '' }] },
+                files: { 'tmp/desktop/app/index.html': 'dist/index.html' }
             }
         },
         webpack: {
@@ -190,7 +201,8 @@ module.exports = function(grunt) {
                         }]})},
                         { test: /runtime\-info\.js$/, loader: StringReplacePlugin.replace({ replacements: [
                             { pattern: /@@VERSION/g, replacement: function() { return pkg.version; } },
-                            { pattern: /@@DATE/g, replacement: function() { return dt; } }
+                            { pattern: /@@DATE/g, replacement: function() { return dt; } },
+                            { pattern: /@@COMMIT/g, replacement: function() { return grunt.config.get('gitinfo.local.branch.current.shortSHA'); } }
                         ]})},
                         { test: /zepto(\.min)?\.js$/, loader: 'exports?Zepto; delete window.$; delete window.Zepto;' },
                         { test: /baron(\.min)?\.js$/, loader: 'exports?baron; delete window.baron;' },
@@ -251,7 +263,7 @@ module.exports = function(grunt) {
         electron: {
             options: {
                 name: 'KeeWeb',
-                dir: 'electron',
+                dir: 'tmp/desktop/app',
                 out: 'tmp/desktop',
                 version: electronVersion,
                 overwrite: true,
@@ -335,6 +347,7 @@ module.exports = function(grunt) {
     });
 
     grunt.registerTask('default', [
+        'gitinfo',
         'bower-install-simple',
         'clean',
         'jshint',
@@ -347,13 +360,15 @@ module.exports = function(grunt) {
         'postcss',
         'inline',
         'htmlmin',
-        'string-replace'
+        'string-replace:manifest'
     ]);
 
     grunt.registerTask('desktop', [
         'gitinfo',
         'clean:desktop_tmp',
         'clean:desktop_dist',
+        'copy:desktop_app_content',
+        'string-replace:desktop_html',
         'electron',
         'electron_builder',
         'compress:linux',
diff --git a/app/manifest.appcache b/app/manifest.appcache
index 0f8b8573..2d741eb0 100644
--- a/app/manifest.appcache
+++ b/app/manifest.appcache
@@ -1,6 +1,6 @@
 CACHE MANIFEST
 
-# YYYY-MM-DD:v0.0.0
+# YYYY-MM-DD:v0.0.0 evElectron
 
 CACHE:
 index.html
diff --git a/app/scripts/comp/runtime-info.js b/app/scripts/comp/runtime-info.js
index 880dc5dd..1255d5bd 100644
--- a/app/scripts/comp/runtime-info.js
+++ b/app/scripts/comp/runtime-info.js
@@ -5,6 +5,7 @@ var Launcher = require('../comp/launcher');
 var RuntimeInfo = {
     version: '@@VERSION',
     buildDate: '@@DATE',
+    commit: '@@COMMIT',
     userAgent: navigator.userAgent,
     launcher: Launcher ? Launcher.name + ' v' + Launcher.version : ''
 };
diff --git a/app/scripts/views/settings/settings-help-view.js b/app/scripts/views/settings/settings-help-view.js
index 04d00245..dac1efe0 100644
--- a/app/scripts/views/settings/settings-help-view.js
+++ b/app/scripts/views/settings/settings-help-view.js
@@ -8,7 +8,7 @@ var SettingsHelpView = Backbone.View.extend({
     template: require('templates/settings/settings-help.html'),
 
     render: function() {
-        var appInfo = 'KeeWeb v' + RuntimeInfo.version + ' (built at ' + RuntimeInfo.buildDate + ')\n' +
+        var appInfo = 'KeeWeb v' + RuntimeInfo.version + ' (' + RuntimeInfo.commit + ', ' + RuntimeInfo.buildDate + ')\n' +
             'Environment: ' + (RuntimeInfo.launcher ? RuntimeInfo.launcher : 'web') + '\n' +
             'User-Agent: ' + RuntimeInfo.userAgent;
         this.renderTemplate({
diff --git a/package.json b/package.json
index f6df2908..0b9b8bf7 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,8 @@
     "string-replace-webpack-plugin": "0.0.2",
     "time-grunt": "^1.2.1",
     "uglify-loader": "^1.2.0",
-    "webpack": "^1.11.0"
+    "webpack": "^1.11.0",
+    "webpack-dev-server": "^1.12.1"
   },
   "scripts": {
     "start": "grunt",