diff --git a/package.json b/package.json
index bc7f0f1a..7b0b161d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "openpgp",
   "description": "OpenPGP.js is a Javascript implementation of the OpenPGP protocol. This is defined in RFC 4880.",
-  "version": "2.6.2",
+  "version": "2.6.1",
   "license": "LGPL-3.0+",
   "homepage": "http://openpgpjs.org/",
   "engines": {
@@ -32,38 +32,55 @@
     "test": "grunt test"
   },
   "devDependencies": {
-    "asmcrypto-lite": "^1.0.0",
     "babel-core": "^6.26.0",
-    "babel-preset-es2015": "^6.3.13",
+    "babel-plugin-syntax-async-functions": "^6.13.0",
+    "babel-plugin-transform-async-to-generator": "^6.24.1",
+    "babel-plugin-transform-regenerator": "^6.26.0",
+    "babel-plugin-transform-runtime": "^6.23.0",
+    "babel-polyfill": "^6.26.0",
+    "babel-preset-env": "^1.6.1",
     "babelify": "^8.0.0",
     "browserify-derequire": "^0.9.4",
     "chai": "~4.1.2",
-    "es6-promise": "^4.1.1",
+    "chai-as-promised": "^7.1.1",
+    "eslint": "^4.16.0",
+    "eslint-config-airbnb": "^16.1.0",
+    "eslint-config-airbnb-base": "^12.1.0",
+    "eslint-plugin-import": "^2.8.0",
+    "eslint-plugin-jsx-a11y": "^6.0.3",
+    "eslint-plugin-react": "^7.6.1",
     "grunt": "~1.0.1",
     "grunt-browserify": "~5.2.0",
     "grunt-contrib-clean": "~1.1.0",
     "grunt-contrib-connect": "~1.0.2",
     "grunt-contrib-copy": "~1.0.0",
-    "grunt-contrib-jshint": "~1.1.0",
     "grunt-contrib-uglify": "~3.2.1",
     "grunt-contrib-watch": "^1.0.0",
-    "grunt-jsbeautifier": "~0.2.10",
-    "grunt-jscs": "^3.0.1",
-    "grunt-jsdoc": "~2.2.0",
-    "grunt-mocha-istanbul": "^5.0.1",
-    "grunt-mocha-test": "~0.13.3",
+    "grunt-jsbeautifier": "^0.2.13",
+    "grunt-jsdoc": "^2.2.1",
+    "grunt-keepalive": "^1.0.0",
+    "grunt-mocha-istanbul": "^5.0.2",
+    "grunt-mocha-test": "^0.13.3",
     "grunt-saucelabs": "9.0.0",
     "grunt-text-replace": "~0.4.0",
-    "istanbul": "~0.4.1",
-    "mocha": "~4.0.1",
-    "rusha": "^0.8.3",
-    "sinon": "^1.17.3",
+    "gruntify-eslint": "^4.0.0",
+    "istanbul": "^0.4.5",
+    "mocha": "^4.0.1",
+    "sinon": "^4.2.2",
     "whatwg-fetch": "~2.0.3",
     "zlibjs": "~0.3.1"
   },
   "dependencies": {
-    "node-fetch": "^1.3.3",
-    "node-localstorage": "~1.3.0"
+    "bn.js": "^4.11.8",
+    "buffer": "^5.0.8",
+    "asn1.js": "^5.0.0",
+    "asmcrypto-lite": "git+https://github.com/openpgpjs/asmcrypto-lite.git",
+    "elliptic": "git+https://github.com/openpgpjs/elliptic.git",
+    "es6-promise": "^4.2.4",
+    "jwk-to-pem": "^1.2.6",
+    "node-fetch": "^1.7.3",
+    "node-localstorage": "~1.3.0",
+    "rusha": "^0.8.12"
   },
   "repository": {
     "type": "git",