diff --git a/CHANGELOG.md b/CHANGELOG.md
index a100a8b..2531ec5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,11 @@
 
+# 0.18.0 - 2020-08-26
+
+* Add feature-gated `bitcoin_hashes` dependency and [`ThirtyTwoByteHash` trait](https://github.com/rust-bitcoin/rust-secp256k1/pull/206/)
+* Add feature-gated [global static context](https://github.com/rust-bitcoin/rust-secp256k1/pull/224) 
+* Allow [all-zero messages](https://github.com/rust-bitcoin/rust-secp256k1/pull/207) to be constructed
+* Bump rust-secp-sys to 0.2.0
+
 # 0.17.2
 - Fix linking in the `fuzztarget` feature.
 
diff --git a/Cargo.toml b/Cargo.toml
index 250eecb..bc082ab 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "secp256k1"
-version = "0.17.2"
+version = "0.18.0"
 authors = [ "Dawid Ciężarkiewicz <dpc@ucore.info>",
             "Andrew Poelstra <apoelstra@wpsoftware.net>" ]
 license = "CC0-1.0"
diff --git a/src/ecdh.rs b/src/ecdh.rs
index 394abe3..2174399 100644
--- a/src/ecdh.rs
+++ b/src/ecdh.rs
@@ -167,7 +167,6 @@ mod tests {
     use rand::thread_rng;
     use super::SharedSecret;
     use super::super::Secp256k1;
-    use Error;
 
     #[test]
     fn ecdh() {
diff --git a/src/key.rs b/src/key.rs
index 8a2c661..8d65185 100644
--- a/src/key.rs
+++ b/src/key.rs
@@ -154,7 +154,7 @@ impl SecretKey {
         &mut self
     ) {
         unsafe {
-            let res = ffi::secp256k1_ec_privkey_negate(
+            let res = ffi::secp256k1_ec_seckey_negate(
                 ffi::secp256k1_context_no_precomp,
                 self.as_mut_c_ptr()
             );
@@ -174,7 +174,7 @@ impl SecretKey {
             return Err(Error::InvalidTweak);
         }
         unsafe {
-            if ffi::secp256k1_ec_privkey_tweak_add(
+            if ffi::secp256k1_ec_seckey_tweak_add(
                 ffi::secp256k1_context_no_precomp,
                 self.as_mut_c_ptr(),
                 other.as_c_ptr(),
@@ -199,7 +199,7 @@ impl SecretKey {
             return Err(Error::InvalidTweak);
         }
         unsafe {
-            if ffi::secp256k1_ec_privkey_tweak_mul(
+            if ffi::secp256k1_ec_seckey_tweak_mul(
                 ffi::secp256k1_context_no_precomp,
                 self.as_mut_c_ptr(),
                 other.as_c_ptr(),