diff --git a/.gitignore b/.gitignore
index c346b13..a2291bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
 bower_components/
 node_modules/
+
+# Electron stuff
+fonts/
+Glowing\ Bear-*/
diff --git a/bower.json b/bower.json
index 72a4e1c..be44d88 100644
--- a/bower.json
+++ b/bower.json
@@ -12,6 +12,9 @@
     "angular-touch": "1.4.x",
     "angular-loader": "1.4.x",
     "angular-mocks": "1.4.x",
-    "html5-boilerplate": "~4.3.0"
+    "html5-boilerplate": "~4.3.0",
+    "underscore": "~1.7",
+    "bootstrap": "~3.1",
+    "emojione": "~2.1"
   }
 }
diff --git a/electron-globals.js b/electron-globals.js
index 05327c0..b5a9ee6 100644
--- a/electron-globals.js
+++ b/electron-globals.js
@@ -14,3 +14,6 @@ var setElectronBadge = function(value) {
 
 // Export global variables and functions
 global.setElectronBadge = setElectronBadge;
+
+// Let Glowing Bear know it's running as an electron app
+window.is_electron = 1;
diff --git a/electron.makefile b/electron.makefile
new file mode 100644
index 0000000..7f75daf
--- /dev/null
+++ b/electron.makefile
@@ -0,0 +1,27 @@
+# Common flags for electron-packager on all platforms
+ELECTRON_COMMON=. "Glowing Bear" --overwrite --version-string.FileDescription="Glowing Bear" --ignore=node_modules --ignore=test --ignore=bower_components
+
+# fetch dependencies for local installation
+bower:
+	bower install
+
+# copy dependencies from bower_components to the correct place
+copylocal:
+	find bower_components \( -name "*min.js" -o -name "*min.css" \) -exec cp {} 3rdparty \;
+	cp -r bower_components/bootstrap/fonts .
+	cp bower_components/emojione/assets/sprites/emojione.sprites.svg 3rdparty
+
+# modify index.html to use local files
+uselocal: copylocal
+	sed -i 's,https://cdnjs.cloudflare.com/ajax/libs/[^\"]*/,3rdparty/,g' index.html
+	sed -i 's, integrity=\".*\" crossorigin=\"anonymous\",,' index.html
+
+# build the electron app for various platforms
+build-electron-windows: uselocal
+	electron-packager ${ELECTRON_COMMON} --platform=win32 --arch=ia32 --version=0.37.2 --icon=assets/img/favicon.ico --asar=true
+
+build-electron-darwin: uselocal
+	electron-packager ${ELECTRON_COMMON} --platform=darwin --arch=x64 --version=0.37.3 --icon=assets/img/glowing-bear.icns
+
+build-electron-linux: uselocal
+	electron-packager ${ELECTRON_COMMON} --platform=linux --arch=x64 --version=0.37.3 --icon=assets/img/favicon.ico
diff --git a/js/glowingbear.js b/js/glowingbear.js
index 54e1f04..e609079 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -104,6 +104,12 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         }
     })();
 
+    if (window.is_electron) {
+        // Use packaged emojione sprite in the electron app
+        emojione.imageType = 'svg';
+        emojione.sprites = true;
+        emojione.imagePathSVGSprites = './3rdparty/emojione.sprites.svg';
+    }
 
     $rootScope.isWindowFocused = function() {
         if (typeof $scope.documentHidden === "undefined") {
diff --git a/package.json b/package.json
index 317078a..dbc35e4 100644
--- a/package.json
+++ b/package.json
@@ -32,8 +32,9 @@
     "update-webdriver": "webdriver-manager update",
     "preprotractor": "npm run update-webdriver",
     "protractor": "protractor test/protractor-conf.js",
-    "build-electron-windows": "electron-packager . \"Glowing Bear\" --platform=win32 --arch=ia32 --version=0.37.2 --overwrite --icon=assets/img/favicon.ico --asar=true --version-string.FileDescription=\"Glowing Bear\" --ignore=node_modules --ignore=test",
-    "build-electron-darwin": "electron-packager . \"Glowing Bear\" --platform=darwin --arch=x64 --version=0.37.3 --overwrite --icon=assets/img/glowing-bear.icns --version-string.FileDescription=\"Glowing Bear\" --ignore=node_modules --ignore=test",
+    "build-electron-windows":  "make -f electron.makefile build-electron-windows",
+    "build-electron-darwin":  "make -f electron.makefile build-electron-darwin",
+    "build-electron-linux":  "make -f electron.makefile build-electron-linux",
     "update-index-async": "node -e \"require('shelljs/global'); sed('-i', /\\/\\/@@NG_LOADER_START@@[\\s\\S]*\\/\\/@@NG_LOADER_END@@/, '//@@NG_LOADER_START@@\\n' + cat('app/bower_components/angular-loader/angular-loader.min.js') + '\\n//@@NG_LOADER_END@@', 'app/index-async.html');\""
   }
 }