diff --git a/Cargo.toml b/Cargo.toml
index 9be83f33..4860a125 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "env_logger"
-version = "0.4.3" # remember to update html_root_url
+version = "0.5.0-rc.1" # remember to update html_root_url
 authors = ["The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
@@ -15,7 +15,7 @@ keywords = ["logging", "log", "logger"]
 publish = false # this branch contains breaking changes
 
 [dependencies]
-log = { git = "https://github.com/rust-lang-nursery/log.git", features = ["std"] }
+log = { version = "0.4.0-rc.1", features = ["std"] }
 regex = { version = "0.2", optional = true }
 termcolor = "0.3"
 chrono = "0.4"
diff --git a/README.md b/README.md
index 660e102f..a817c1f9 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,8 @@ It must be added along with `log` to the project dependencies:
 
 ```toml
 [dependencies]
-log = "0.3"
-env_logger = "0.3"
+log = "0.4.0-rc.1"
+env_logger = "0.5.0-rc.1"
 ```
 
 `env_logger` must be initialized as early as possible in the project. After it's initialized, you can use the `log` macros to do actual logging.
@@ -51,10 +51,10 @@ Tests can use the `env_logger` crate to see log messages generated during that t
 
 ```toml
 [dependencies]
-log = "0.3"
+log = "0.4.0-rc.1"
 
 [dev-dependencies]
-env_logger = "0.3"
+env_logger = "0.5.0-rc.1"
 ```
 
 ```rust
diff --git a/examples/custom_logger.rs b/examples/custom_logger.rs
index 84e06701..31b46575 100644
--- a/examples/custom_logger.rs
+++ b/examples/custom_logger.rs
@@ -37,11 +37,10 @@ impl MyLogger {
     }
 
     fn init() -> Result<(), SetLoggerError> {
-        log::set_boxed_logger(|max_level| {
-            let logger = Self::new();
-            max_level.set(logger.inner.filter());
-            Box::new(logger)
-        })
+        let logger = Self::new();
+
+        log::set_max_level(logger.inner.filter());
+        log::set_boxed_logger(Box::new(logger))
     }
 }
 
diff --git a/src/lib.rs b/src/lib.rs
index c0d2989c..9d4bd270 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -131,7 +131,7 @@
 
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "https://docs.rs/env_logger/0.4.3")]
+       html_root_url = "https://docs.rs/env_logger/0.5.0-rc.1")]
 #![cfg_attr(test, deny(warnings))]
 
 // When compiled for the rustc compiler itself we want to make sure that this is
@@ -250,7 +250,12 @@ impl Builder {
                 };
 
                 let write_level = write!(buf.color(level_color), "{}:", level);
-                let write_args = writeln!(buf, " {}: {}: {}", ts, record.module_path(), record.args());
+                let write_args = if let Some(module_path) = record.module_path() {
+                    writeln!(buf, " {}: {}: {}", ts, module_path, record.args())
+                }
+                else {
+                    writeln!(buf, " {}: {}", ts, record.args())
+                };
 
                 write_level.and(write_args)
             }),
@@ -316,11 +321,10 @@ impl Builder {
     /// This function will fail if it is called more than once, or if another
     /// library has already initialized a global logger.
     pub fn try_init(&mut self) -> Result<(), SetLoggerError> {
-        log::set_boxed_logger(|max_level| {
-            let logger = self.build();
-            max_level.set(logger.filter());
-            Box::new(logger)
-        })
+        let logger = self.build();
+
+        log::set_max_level(logger.filter());
+        log::set_boxed_logger(Box::new(logger))
     }
 
     /// Initializes the global logger with the built env logger.
@@ -371,11 +375,10 @@ impl Logger {
     /// use env_logger::Logger;
     ///
     /// fn main() {
-    ///     log::set_boxed_logger(|max_level| {
-    ///         let logger = Logger::new();
-    ///         max_level.set(logger.filter());
-    ///         Box::new(logger)
-    ///     });
+    ///     let logger = Logger::new();
+    /// 
+    ///     log::set_max_level(logger.filter());
+    ///     log::set_boxed_logger(Box::new(logger));
     /// }
     /// ```
     ///
@@ -405,11 +408,10 @@ impl Logger {
     /// use env_logger::Logger;
     ///
     /// fn main() {
-    ///     log::set_boxed_logger(|max_level| {
-    ///         let logger = Logger::from_env("MY_LOG");
-    ///         max_level.set(logger.filter());
-    ///         Box::new(logger)
-    ///     });
+    ///     let logger = Logger::from_env("MY_LOG");
+    /// 
+    ///     log::set_max_level(logger.filter());
+    ///     log::set_boxed_logger(Box::new(logger));
     /// }
     /// ```
     ///