diff --git a/.travis.yml b/.travis.yml
index 5d4df6d66a..5db19a1d83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,5 +3,5 @@ rust:
   - stable
   - beta
   - nightly
-  - 1.14.0
+  - 1.22.0
 
diff --git a/Cargo.toml b/Cargo.toml
index 9e126960c5..66647f82c5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bitcoinconsensus"
-version = "0.16.4"
+version = "0.17.0"
 authors = ["Tamas Blummer <tamas.blummer@gmail.com>"]
 license = "Apache-2.0"
 homepage = "https://github.com/rust-bitcoin/rust-bitcoinconsensus/"
@@ -19,8 +19,8 @@ path = "src/lib.rs"
 libc="0.2"
 
 [build-dependencies]
-cc = "=1.0.26"
+cc = ">= 1.0.36"
 
 [dev-dependencies]
 rustc-serialize = "0.3"
-secp256k1 = "0.12"
+secp256k1 = { version = "0.15", features = ["recovery"] }
diff --git a/appveyor.yml b/appveyor.yml
index c43975805c..4eb2697f61 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,9 +4,9 @@ os: Visual Studio 2015
 
 environment:
   matrix:
-    - channel: 1.14.0
+    - channel: 1.22.0
       target: x86_64-pc-windows-msvc
-    - channel: 1.14.0
+    - channel: 1.22.0
       target: i686-pc-windows-msvc
       
     - channel: stable
diff --git a/build.rs b/build.rs
index ae8736b090..a03d38bbb2 100644
--- a/build.rs
+++ b/build.rs
@@ -3,7 +3,6 @@ extern crate cc;
 use std::env;
 
 fn main() {
-    let target = env::var("TARGET").unwrap();
     let mut base_config = cc::Build::new();
     base_config
         .cpp(true)
@@ -19,22 +18,10 @@ fn main() {
     } else if tool.is_like_clang() || tool.is_like_gnu() {
         base_config.flag("-std=c++11").flag("-Wno-unused-parameter");
     }
-
-    if target == "x86_64-unknown-linux-gnu" {
+    #[cfg(target_os = "windows")]
+    {
         base_config
-            .define("HAVE_ENDIAN_H", Some("1"))
-            .define("HAVE_DECL_HTOBE16", Some("1"))
-            .define("HAVE_DECL_HTOLE16", Some("1"))
-            .define("HAVE_DECL_BE16TOH", Some("1"))
-            .define("HAVE_DECL_LE16TOH", Some("1"))
-            .define("HAVE_DECL_HTOBE32", Some("1"))
-            .define("HAVE_DECL_HTOLE32", Some("1"))
-            .define("HAVE_DECL_BE32TOH", Some("1"))
-            .define("HAVE_DECL_LE32TOH", Some("1"))
-            .define("HAVE_DECL_HTOBE64", Some("1"))
-            .define("HAVE_DECL_HTOLE64", Some("1"))
-            .define("HAVE_DECL_BE64TOH", Some("1"))
-            .define("HAVE_DECL_LE64TOH", Some("1"));
+            .define("WIN32", Some("1"));
     }
     base_config
         .file("bitcoin/src/utilstrencodings.cpp")