diff --git a/.gitignore b/.gitignore
index c21e6c76781..f08c7144734 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,6 @@
 Cargo.lock
 /target/
 **/*.rs.bk
+#IntelliJ IDEA files
+.idea
+*.iml
diff --git a/Cargo.toml b/Cargo.toml
index bff66532004..96acc74219f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,9 +12,15 @@ Still super-early code-dump quality and is missing large chunks. See README in g
 [features]
 # Supports tracking channels with a non-bitcoin chain hashes. Currently enables all kinds of fun DoS attacks.
 non_bitcoin_chain_hash_routing = []
+spv = ["bitcoin-spv"]
 
 [dependencies]
 bitcoin = "0.11"
 rust-crypto = "0.2"
 rand = "0.4"
 secp256k1 = "0.8"
+bitcoin-spv = { git = "https://github.com/tamasblummer/bitcoin-spv", branch = "integration", optional = true }
+
+[patch.crates-io]
+bitcoin = { git = "https://github.com/tamasblummer/rust-bitcoin", branch = "prs"  }
+