diff --git a/macros/src/lib.rs b/macros/src/lib.rs
index e625ee2..01e237a 100644
--- a/macros/src/lib.rs
+++ b/macros/src/lib.rs
@@ -13,7 +13,9 @@
 #![feature(plugin_registrar, quote, int_uint, box_syntax)]
 #![deny(warnings)]
 #![allow(unused_imports)]  // for quotes
-#![allow(unstable)]
+#![feature(core)]
+#![feature(rustc_private)]
+#![feature(std_misc)]
 
 extern crate core;
 extern crate syntax;
diff --git a/src/lib.rs b/src/lib.rs
index 7601fb2..85f201c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -10,10 +10,14 @@
 #![crate_name = "string_cache"]
 #![crate_type = "rlib"]
 
-#![feature(plugin, old_orphan_check)]
 #![no_std]
 #![deny(warnings)]
-#![allow(unstable)]
+#![feature(alloc)]
+#![feature(collections)]
+#![feature(core)]
+#![feature(hash)]
+#![feature(plugin)]
+#![cfg_attr(test, feature(test, std_misc))]
 
 #[macro_use]
 extern crate core;
diff --git a/src/namespace.rs b/src/namespace.rs
index 1c78916..81667c5 100644
--- a/src/namespace.rs
+++ b/src/namespace.rs
@@ -7,7 +7,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![experimental="This may move as string-cache becomes less Web-specific."]
+#![unstable(feature = "string_cache_namespace",
+            reason = "This may move as string-cache becomes less Web-specific.")]
 
 use core::prelude::*;