diff --git a/ecdh.cc b/ecdh.cc
index 9a21024..6ec29c2 100644
--- a/ecdh.cc
+++ b/ecdh.cc
@@ -67,39 +67,37 @@ error:
 #undef CHECK
 
 NAN_METHOD(Derive) {
-  NanScope();
-
-  if (args.Length() != 2 ||
-      !node::Buffer::HasInstance(args[0]) ||  // privkey_a
-      !node::Buffer::HasInstance(args[1])) {  // pubkey_b
-    return NanThrowError("Bad input");
+  if (info.Length() != 2 ||
+      !node::Buffer::HasInstance(info[0]) ||  // privkey_a
+      !node::Buffer::HasInstance(info[1])) {  // pubkey_b
+    return Nan::ThrowError("Bad input");
   }
 
-  char* privkey_a = node::Buffer::Data(args[0]);
-  size_t privkey_a_len = node::Buffer::Length(args[0]);
-  char* pubkey_b = node::Buffer::Data(args[1]);
-  size_t pubkey_b_len = node::Buffer::Length(args[1]);
+  char* privkey_a = node::Buffer::Data(info[0]);
+  size_t privkey_a_len = node::Buffer::Length(info[0]);
+  char* pubkey_b = node::Buffer::Data(info[1]);
+  size_t pubkey_b_len = node::Buffer::Length(info[1]);
   if (privkey_a == NULL ||
       privkey_a_len != PRIVKEY_SIZE ||
       pubkey_b == NULL ||
       pubkey_b_len != PUBKEY_SIZE ||
       pubkey_b[0] != 4) {
-    return NanThrowError("Bad input");
+    return Nan::ThrowError("Bad input");
   }
 
   uint8_t* shared = (uint8_t *)malloc(PRIVKEY_SIZE);
   if (shared == NULL ||
       derive((uint8_t *)privkey_a, (uint8_t *)pubkey_b, shared)) {
     free(shared);
-    return NanThrowError("Internal error");
+    return Nan::ThrowError("Internal error");
   }
-  NanReturnValue(NanBufferUse((char *)shared, PRIVKEY_SIZE));
+  info.GetReturnValue().Set(
+    Nan::NewBuffer((char *)shared, PRIVKEY_SIZE).ToLocalChecked());
 }
 
-void InitAll(Handle<Object> exports) {
-  exports->Set(
-      NanNew<String>("derive"),
-      NanNew<FunctionTemplate>(Derive)->GetFunction());
+NAN_MODULE_INIT(InitAll) {
+  Nan::Set(target, Nan::New<String>("derive").ToLocalChecked(),
+    Nan::GetFunction(Nan::New<FunctionTemplate>(Derive)).ToLocalChecked());
 }
 
 NODE_MODULE(ecdh, InitAll)
diff --git a/index.js b/index.js
index 017a646..8d5fcf5 100644
--- a/index.js
+++ b/index.js
@@ -61,13 +61,30 @@ function equalConstTime(b1, b2) {
   return res === 0;
 }
 
+function pad32(msg){
+  var buf;
+  if (msg.length < 32) {
+    buf = new Buffer(32);
+    buf.fill(0);
+    msg.copy(buf, 32 - msg.length);
+    return buf;
+  } else {
+    return msg;
+  }
+}
+
 /**
  * Compute the public key for a given private key.
  * @param {Buffer} privateKey - A 32-byte private key
  * @return {Buffer} A 65-byte public key.
  * @function
  */
-var getPublic = exports.getPublic = secp256k1.createPublicKey;
+var getPublic = exports.getPublic = function(privateKey) {
+  assert(privateKey.length === 32, "Bad private key");
+  // See https://github.com/wanderer/secp256k1-node/issues/46
+  var compressed = secp256k1.publicKeyCreate(privateKey);
+  return secp256k1.publicKeyConvert(compressed, false);
+};
 
 /**
  * Create an ECDSA signature.
@@ -80,7 +97,9 @@ exports.sign = function(privateKey, msg) {
   return new promise(function(resolve) {
     assert(msg.length > 0, "Message should not be empty");
     assert(msg.length <= 32, "Message is too long");
-    resolve(secp256k1.sign(privateKey, msg));
+    msg = pad32(msg);
+    var sig = secp256k1.signSync(msg, privateKey).signature;
+    resolve(secp256k1.signatureExport(sig));
   });
 };
 
@@ -96,7 +115,9 @@ exports.verify = function(publicKey, msg, sig) {
   return new promise(function(resolve, reject) {
     assert(msg.length > 0, "Message should not be empty");
     assert(msg.length <= 32, "Message is too long");
-    if (secp256k1.verify(publicKey, msg, sig) === 1) {
+    msg = pad32(msg);
+    sig = secp256k1.signatureImport(sig);
+    if (secp256k1.verifySync(msg, sig, publicKey)) {
      resolve(null);
     } else {
      reject(new Error("Bad signature"));
diff --git a/package.json b/package.json
index df7d748..d1552ec 100644
--- a/package.json
+++ b/package.json
@@ -49,11 +49,11 @@
     "mocha": "*"
   },
   "dependencies": {
-    "elliptic": "^5.0.0",
+    "elliptic": "^6.0.2",
     "es6-promise": "^3.0.2",
-    "nan": "^2.0.9"
+    "nan": "^2.1.0"
   },
   "optionalDependencies": {
-    "secp256k1": "^1.1.4"
+    "secp256k1": "^2.0.2"
   }
 }