diff --git a/src/crypto/public_key/elliptic/ecdh.js b/src/crypto/public_key/elliptic/ecdh.js
new file mode 100644
index 00000000..fc28064d
--- /dev/null
+++ b/src/crypto/public_key/elliptic/ecdh.js
@@ -0,0 +1,129 @@
+// OpenPGP.js - An OpenPGP implementation in javascript
+// Copyright (C) 2015-2016 Decentral
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 3.0 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+// Key encryption and decryption for RFC 6637 ECDH
+
+/**
+ * @requires crypto/hash
+ * @requires crypto/cipher
+ * @requires crypto/rfc3394
+ * @requires crypto/public_key/elliptic/curves
+ * @requires crypto/public_key/jsbn
+ * @requires type/oid
+ * @requires type/kdf_params
+ * @requires enums
+ * @requires util
+ * @module crypto/public_key/elliptic/ecdh
+ */
+
+'use strict';
+
+import BigInteger from '../jsbn.js';
+import curves from './curves.js';
+import cipher from '../../cipher';
+import hash from '../../hash';
+import rfc3394 from '../../rfc3394.js';
+import enums from '../../../enums.js';
+import util from '../../../util.js';
+import type_kdf_params from '../../../type/kdf_params.js';
+import type_oid from '../../../type/oid.js';
+
+function hex2Uint8Array(hex) {
+  var result = new Uint8Array(hex.length/2);
+  for (var k=0; k<hex.length/2; k++) {
+    result[k] = parseInt(hex.substr(2*k, 2), 16);
+  }
+  return result;
+}
+
+// Build Param for ECDH algorithm (RFC 6637)
+function buildEcdhParam(public_algo, oid, cipher_algo, hash_algo, fingerprint) {
+  oid = new type_oid(oid);
+  const kdf_params = new type_kdf_params(hash_algo, cipher_algo);
+  return util.concatUint8Array([
+    oid.write(),
+    new Uint8Array([public_algo]),
+    kdf_params.write(),
+    util.str2Uint8Array("Anonymous Sender    "),
+    fingerprint
+  ]);
+}
+
+// Key Derivation Function (RFC 6637)
+function kdf(hash_algo, X, length, param) {
+  return hash.digest(hash_algo, util.concatUint8Array([
+    new Uint8Array([0, 0, 0, 1]),
+    new Uint8Array(X),
+    param
+  ])).subarray(0, length);
+}
+
+/**
+ * Encrypt and wrap a session key
+ *
+ * @param  {String}      oid          Oid of the curve to use
+ * @param  {Enums}       cipher_algo  Symmetric cipher to use
+ * @param  {Enums}       hash_algo    Hash to use
+ * @param  {Uint8Array}  m            Value derived from session key (RFC 6637)
+ * @param  {BigInteger}  R            Recipient public key
+ * @param  {String}      fingerprint  Recipient fingerprint
+ * @return {{V: BigInteger, C: Uint8Array}}  Returns ephemeral key and encoded session key
+ */
+function encrypt(oid, cipher_algo, hash_algo, m, R, fingerprint) {
+  fingerprint = hex2Uint8Array(fingerprint);
+  const param = buildEcdhParam(enums.publicKey.ecdh, oid, cipher_algo, hash_algo, fingerprint);
+  const curve = curves.get(oid);
+  cipher_algo = enums.read(enums.symmetric, cipher_algo);
+  const v = curve.genKeyPair();
+  R = curve.keyFromPublic(R.toByteArray());
+  const S = v.derive(R);
+  const Z = kdf(hash_algo, S, cipher[cipher_algo].keySize, param);
+  const C = rfc3394.wrap(Z, m);
+  return {
+    V: new BigInteger(v.getPublic()),
+    C: C
+  };
+}
+
+/**
+ * Decrypt and unwrap the value derived from session key
+ *
+ * @param  {String}      oid          Curve oid
+ * @param  {Enums}       cipher_algo  Symmetric cipher to use
+ * @param  {Enums}       hash_algo    Hash algorithm to use
+ * @param  {BigInteger}  V            Public part of ephemeral key
+ * @param  {Uint8Array}  C            Encrypted and wrapped value derived from session key
+ * @param  {BigInteger}  r            Recipient private key
+ * @param  {String}      fingerprint  Recipient fingerprint
+ * @return {Uint8Array}               Value derived from session
+ */
+function decrypt(oid, cipher_algo, hash_algo, V, C, r, fingerprint) {
+  fingerprint = hex2Uint8Array(fingerprint);
+  const param = buildEcdhParam(enums.publicKey.ecdh, oid, cipher_algo, hash_algo, fingerprint);
+  const curve = curves.get(oid);
+  cipher_algo = enums.read(enums.symmetric, cipher_algo);
+  V = curve.keyFromPublic(V.toByteArray());
+  r = curve.keyFromPrivate(r.toByteArray());
+  const S = r.derive(V);
+  const Z = kdf(hash_algo, S, cipher[cipher_algo].keySize, param);
+  return new BigInteger(rfc3394.unwrap(Z, C));
+}
+
+module.exports = {
+  encrypt: encrypt,
+  decrypt: decrypt
+};
diff --git a/src/crypto/public_key/elliptic/index.js b/src/crypto/public_key/elliptic/index.js
index fab93a04..f6acefb1 100644
--- a/src/crypto/public_key/elliptic/index.js
+++ b/src/crypto/public_key/elliptic/index.js
@@ -19,6 +19,7 @@
 
 /**
  * @requires crypto/public_key/elliptic/curve
+ * @requires crypto/public_key/elliptic/ecdh
  * @requires crypto/public_key/elliptic/ecdsa
  * @module crypto/public_key/elliptic
  */
@@ -26,9 +27,11 @@
 'use strict';
 
 import {get, generate} from './curves.js';
+import ecdh from './ecdh.js';
 import ecdsa from './ecdsa.js';
 
 module.exports = {
+  ecdh: ecdh,
   ecdsa: ecdsa,
   get: get,
   generate: generate
diff --git a/src/enums.js b/src/enums.js
index bee7b985..edaecb5d 100644
--- a/src/enums.js
+++ b/src/enums.js
@@ -27,6 +27,7 @@ export default {
     rsa_sign: 3,
     elgamal: 16,
     dsa: 17,
+    ecdh: 18,
     ecdsa: 19
   },
 
diff --git a/test/crypto/elliptic.js b/test/crypto/elliptic.js
index e4b56fa2..c52dcf4d 100644
--- a/test/crypto/elliptic.js
+++ b/test/crypto/elliptic.js
@@ -291,4 +291,58 @@ describe('Elliptic Curve Cryptography', function () {
       done();
     });
   });
+  describe('ECDH key exchange', function () {
+    var decrypt_message = function (oid, hash, cipher, priv, ephemeral, data, fingerprint) {
+      if (typeof data === 'string') {
+        data = openpgp.util.str2Uint8Array(data);
+      } else {
+        data = new Uint8Array(data);
+      }
+      return function () {
+        var ecdh = elliptic_curves.ecdh;
+        return ecdh.decrypt(
+          oid,
+          cipher,
+          hash,
+          bin2bi(ephemeral),
+          data,
+          bin2bi(priv),
+          fingerprint
+        );
+      };
+    };
+    var secp256k1_value = new Uint8Array([
+      0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]);
+    var secp256k1_point = new Uint8Array([0x04,
+      0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]);
+    var secp256k1_data = new Uint8Array([
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]);
+
+    it('Invalid curve oid', function (done) {
+      var res = decrypt_message('', 2, 7, [], [], [], '');
+      expect(res).to.throw(Error, /Not valid curve/);
+      done();
+    });
+    it('Invalid ephemeral key', function (done) {
+      var res = decrypt_message('secp256k1', 2, 7, [], [], [], '');
+      expect(res).to.throw(Error, /Unknown point format/);
+      done();
+    });
+    it('Invalid key data integrity', function (done) {
+      var res = decrypt_message('secp256k1', 2, 7, secp256k1_value, secp256k1_point, secp256k1_data, '');
+      expect(res).to.throw(Error, /Key Data Integrity failed/);
+      done();
+    });
+  });
 });