diff --git a/Cargo.toml b/Cargo.toml
index fb52d14d5..ef368543b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,10 +9,10 @@ authors = ["Ethcore <admin@ethcore.io>"]
 log = "0.3"
 env_logger = "0.3"
 rustc-serialize = "0.3"
-docopt = "0.6"
-docopt_macros = "0.6"
+docopt = { git = "https://github.com/NikVolf/docopt.rs.git" }
+docopt_macros = { git = "https://github.com/NikVolf/docopt.rs.git", path = "docopt_macros" }
 ctrlc = { git = "https://github.com/tomusdrw/rust-ctrlc.git" }
-clippy = "0.0.37"
+clippy = "0.0.39"
 ethcore-util = { path = "util" }
 ethcore = { path = "ethcore" }
 ethsync = { path = "sync" }
diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml
index be7652e17..7f8259e96 100644
--- a/ethcore/Cargo.toml
+++ b/ethcore/Cargo.toml
@@ -18,7 +18,7 @@ ethcore-util = { path = "../util" }
 evmjit = { path = "../evmjit", optional = true }
 ethash = { path = "../ethash" }
 num_cpus = "0.2"
-clippy = "0.0.37"
+clippy = "0.0.39"
 crossbeam = "0.1.5"
 lazy_static = "0.1"
 
diff --git a/ethcore/src/ethereum/mod.rs b/ethcore/src/ethereum/mod.rs
index 11c20ddbe..0d1dcd8d5 100644
--- a/ethcore/src/ethereum/mod.rs
+++ b/ethcore/src/ethereum/mod.rs
@@ -24,7 +24,7 @@ pub mod ethash;
 /// Export the denominations module.
 pub mod denominations;
 
-pub use self::ethash::*;
+pub use self::ethash::{Ethash};
 pub use self::denominations::*;
 
 use super::spec::*;
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index 66688466c..e5b5bb797 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -16,6 +16,6 @@ jsonrpc-http-server = "1.1"
 ethcore-util = { path = "../util" }
 ethcore = { path = "../ethcore" }
 ethsync = { path = "../sync" }
-clippy = "0.0.37"
+clippy = "0.0.39"
 target_info = "0.1.0"
 rustc-serialize = "0.3"
diff --git a/sync/Cargo.toml b/sync/Cargo.toml
index 75853e0ab..eb060cf90 100644
--- a/sync/Cargo.toml
+++ b/sync/Cargo.toml
@@ -10,7 +10,7 @@ authors = ["Ethcore <admin@ethcore.io"]
 [dependencies]
 ethcore-util = { path = "../util" }
 ethcore = { path = ".." }
-clippy = "0.0.37"
+clippy = "0.0.39"
 log = "0.3"
 env_logger = "0.3"
 time = "0.1.34"
diff --git a/util/Cargo.toml b/util/Cargo.toml
index 733b08701..38f7006f3 100644
--- a/util/Cargo.toml
+++ b/util/Cargo.toml
@@ -26,7 +26,7 @@ crossbeam = "0.2"
 slab = { git = "https://github.com/arkpar/slab.git" }
 sha3 = { path = "sha3" }
 serde = "0.6.7"
-clippy = "0.0.37"
+clippy = "0.0.39"
 json-tests = { path = "json-tests" }
 target_info = "0.1.0"
 igd = "0.4.2"