diff --git a/.gitignore b/.gitignore
index bbce71f..8f21600 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 #Exclude modules node
 node_modules/
 
-#Exclude modules node
-build/
-
 yarn\.lock
+dist/*
+*.log
diff --git a/.travis.yml b/.travis.yml
index b03cbac..87ee5fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ install:
     - 'npm install -g xvfb-maybe'
     - yarn
 script:
-    - 'yarn run build'
+    - 'yarn run dist'
 #branches:
 #    only:
 #	- master
diff --git a/icons/png/1024x1024.png b/build/1024x1024.png
similarity index 100%
rename from icons/png/1024x1024.png
rename to build/1024x1024.png
diff --git a/icons/png/128x128.png b/build/128x128.png
similarity index 100%
rename from icons/png/128x128.png
rename to build/128x128.png
diff --git a/icons/png/16x16.png b/build/16x16.png
similarity index 100%
rename from icons/png/16x16.png
rename to build/16x16.png
diff --git a/icons/png/24x24.png b/build/24x24.png
similarity index 100%
rename from icons/png/24x24.png
rename to build/24x24.png
diff --git a/icons/png/256x256.png b/build/256x256.png
similarity index 100%
rename from icons/png/256x256.png
rename to build/256x256.png
diff --git a/icons/png/32x32.png b/build/32x32.png
similarity index 100%
rename from icons/png/32x32.png
rename to build/32x32.png
diff --git a/icons/png/48x48.png b/build/48x48.png
similarity index 100%
rename from icons/png/48x48.png
rename to build/48x48.png
diff --git a/icons/png/512x512.png b/build/512x512.png
similarity index 100%
rename from icons/png/512x512.png
rename to build/512x512.png
diff --git a/icons/png/64x64.png b/build/64x64.png
similarity index 100%
rename from icons/png/64x64.png
rename to build/64x64.png
diff --git a/icons/mac/icon.icns b/build/icon.icns
similarity index 100%
rename from icons/mac/icon.icns
rename to build/icon.icns
diff --git a/icons/win/icon.ico b/build/icon.ico
similarity index 100%
rename from icons/win/icon.ico
rename to build/icon.ico
diff --git a/package.json b/package.json
index 338b1be..9eb01b8 100644
--- a/package.json
+++ b/package.json
@@ -5,29 +5,44 @@
   "version": "1.1.0",
   "description": "Just a simple project made with electron JS to show Android Messages from Google in a app with notifications.",
   "main": "main.js",
-    "scripts": {
-	"start": "electron .",
-    "package-mac": "electron-packager . --overwrite --platform=darwin --arch=x64 --out=build/macos/ --icon=icons/mac/icon.icns --prune=true",
-    "package-win": "electron-packager . --overwrite --asar=true --platform=win32 --arch=ia32 --icon=icons/win/icon.ico --prune=true --out=build/windows/ --version-string.CompanyName=CE --version-string.FileDescription=CE --version-string.ProductName='Android Messages'",
-    "package-linux": "electron-packager . android-messages-app --overwrite --asar=true --platform=linux --arch=x64 --icon=icons/png/1024x1024.png --prune=true --out=build"
+  "scripts": {
+    "start": "electron .",
+    "pack": "electron-builder --dir",
+    "dist": "electron-builder"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/antoineguilbert/android-messages-for-desktop.git"
   },
   "author": "Antoine Guilbert",
-  "license": "ISC",
+  "license": "MIT",
   "homepage": "https://github.com/antoineguilbert/android-messages-for-desktop/blob/master/README.md",
+  "build": {
+    "appId": "com.antoineguilbert.android-messages",
+    "mac": {
+      "category": "public.app-category.social-networking",
+			"target": "dmg"
+    },
+    "win": {
+      "target": "nsis"
+    },
+    "nsis": {
+      "oneClick": false,
+      "allowToChangeInstallationDirectory": true
+    },
+    "linux": {
+      "target": "AppImage"
+    },
+    "publish": ["github"]
+  },
   "devDependencies": {
     "electron": "^2.0.3",
+    "electron-builder": "^20.17.0",
     "electron-winstaller": "^2.6.4"
   },
   "dependencies": {
     "electron-context-menu": "^0.10.0",
     "electron-packager": "^12.1.0",
     "electron-window-state": "^4.1.1"
-  },
-  "directories": {
-    "buildResources ": "icons"
   }
 }