diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index 15d27c613423..6868a063ce58 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -22,6 +22,7 @@ use util::{exe, add_lib_path};
 use compile;
 use native;
 use channel::GitInfo;
+use channel;
 use cache::Interned;
 use toolstate::ToolState;
 
@@ -240,6 +241,7 @@ pub fn prepare_tool_cargo(
 
     cargo.env("CFG_RELEASE_CHANNEL", &builder.config.channel);
     cargo.env("CFG_VERSION", builder.rust_version());
+    cargo.env("CFG_RELEASE_NUM", channel::CFG_RELEASE_NUM);
 
     let info = GitInfo::new(&builder.config, &dir);
     if let Some(sha) = info.sha() {
diff --git a/src/tools/clippy b/src/tools/clippy
index 246a77ebe8c9..2e26fdc2a86f 160000
--- a/src/tools/clippy
+++ b/src/tools/clippy
@@ -1 +1 @@
-Subproject commit 246a77ebe8c9d640c76a82f3869c5272ba51346d
+Subproject commit 2e26fdc2a86f03771a31b8a1e1a35cf8397cb69b