diff --git a/src/lib.rs b/src/lib.rs
index c3a34ae1..6f758c65 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -50,14 +50,14 @@
 //! }
 //! ```
 #![doc(html_root_url="https://sfackler.github.io/doc")]
-#![feature(globs, macro_rules, phase, unsafe_destructor, slicing_syntax, default_type_params, old_orphan_check, associated_types)]
+#![feature(plugin, unsafe_destructor, slicing_syntax, old_orphan_check)]
 #![warn(missing_docs)]
 
-#[phase(plugin, link)]
+#[macro_use]
 extern crate log;
 extern crate openssl;
 extern crate phf;
-#[phase(plugin)]
+#[plugin] #[no_link]
 extern crate phf_mac;
 extern crate "rustc-serialize" as serialize;
 extern crate time;
@@ -72,7 +72,6 @@ use std::collections::{RingBuf, HashMap};
 use std::fmt;
 use std::io::{BufferedStream, IoResult, IoError, IoErrorKind};
 use std::io::net::ip::Port;
-use std::iter::IteratorCloneExt;
 use std::mem;
 use std::result;
 use std::time::Duration;
@@ -87,7 +86,7 @@ use message::FrontendMessage::*;
 use message::{FrontendMessage, BackendMessage, RowDescriptionEntry};
 use message::{WriteMessage, ReadMessage};
 
-#[macro_escape]
+#[macro_use]
 mod macros;
 
 mod error;
diff --git a/tests/test.rs b/tests/test.rs
index 42db8402..0e3462c7 100644
--- a/tests/test.rs
+++ b/tests/test.rs
@@ -1,6 +1,5 @@
-#![feature(macro_rules, phase, slicing_syntax)]
+#![feature(slicing_syntax)]
 
-#[phase(plugin, link)]
 extern crate postgres;
 extern crate "rustc-serialize" as serialize;
 extern crate url;