diff --git a/src/libextra/lib.rs b/src/libextra/lib.rs
index 6532ae3dc5c..8e739809b87 100644
--- a/src/libextra/lib.rs
+++ b/src/libextra/lib.rs
@@ -20,22 +20,14 @@ Rust extras are part of the standard Rust distribution.
 
 */
 
-#[pkgid="extra#0.9-pre"];
-// NOTE: remove after the next snapshot
-#[link(name = "extra",
-       package_id = "extra",
-       vers = "0.9-pre",
-       uuid = "122bed0b-c19b-4b82-b0b7-7ae8aead7297",
-       url = "https://github.com/mozilla/rust/tree/master/src/libextra")];
-
-#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
-      html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-      html_root_url = "http://static.rust-lang.org/doc/master")];
-
+#[pkgid = "extra#0.9-pre"];
 #[comment = "Rust extras"];
 #[license = "MIT/ASL2"];
 #[crate_type = "rlib"];
 #[crate_type = "dylib"];
+#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
+      html_favicon_url = "http://www.rust-lang.org/favicon.ico",
+      html_root_url = "http://static.rust-lang.org/doc/master")];
 
 #[feature(macro_rules, globs, managed_boxes)];
 
diff --git a/src/librustc/front/test.rs b/src/librustc/front/test.rs
index 192249d6435..f2f729561cf 100644
--- a/src/librustc/front/test.rs
+++ b/src/librustc/front/test.rs
@@ -375,9 +375,8 @@ fn mk_tests(cx: &TestCtxt) -> @ast::item {
 }
 
 fn is_extra(crate: &ast::Crate) -> bool {
-    let items = attr::find_linkage_metas(crate.attrs);
-    match attr::last_meta_item_value_str_by_name(items, "name") {
-        Some(s) if "extra" == s => true,
+    match attr::find_pkgid(crate.attrs) {
+        Some(ref s) if "extra" == s.name => true,
         _ => false
     }
 }
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index 7adb014de67..a26fd9f5af2 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -8,14 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="rustc#0.9-pre"];
-// NOTE: remove after the next snapshot
-#[link(name = "rustc",
-       package_id = "rustc",
-       vers = "0.9-pre",
-       uuid = "0ce89b41-2f92-459e-bbc1-8f5fe32f16cf",
-       url = "https://github.com/mozilla/rust/tree/master/src/rustc")];
-
+#[pkgid = "rustc#0.9-pre"];
 #[comment = "The Rust compiler"];
 #[license = "MIT/ASL2"];
 #[crate_type = "dylib"];
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 3e7b7cdfac9..0727c04f44e 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -8,14 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[pkgid="rustdoc#0.9-pre"];
-// NOTE: remove after the next snapshot
-#[link(name = "rustdoc",
-       package_id = "rustdoc",
-       vers = "0.9-pre",
-       uuid = "8c6e4598-1596-4aa5-a24c-b811914bbbc6",
-       url = "https://github.com/mozilla/rust/tree/master/src/librustdoc")];
-
+#[pkgid = "rustdoc#0.9-pre"];
 #[desc = "rustdoc, the Rust documentation extractor"];
 #[license = "MIT/ASL2"];
 #[crate_type = "dylib"];
diff --git a/src/librustpkg/lib.rs b/src/librustpkg/lib.rs
index 76d2db0a587..14c5966aabd 100644
--- a/src/librustpkg/lib.rs
+++ b/src/librustpkg/lib.rs
@@ -10,14 +10,7 @@
 
 // rustpkg - a package manager and build system for Rust
 
-#[pkgid="rustpkg#0.9-pre"];
-// NOTE: remove after the next snapshot
-#[link(name = "rustpkg",
-       package_id = "rustpkg",
-       vers = "0.9-pre",
-       uuid = "25de5e6e-279e-4a20-845c-4cabae92daaf",
-       url = "https://github.com/mozilla/rust/tree/master/src/librustpkg")];
-
+#[pkgid = "rustpkg#0.9-pre"];
 #[license = "MIT/ASL2"];
 #[crate_type = "dylib"];
 
diff --git a/src/librustuv/lib.rs b/src/librustuv/lib.rs
index d8bf356a099..34d36b486b3 100644
--- a/src/librustuv/lib.rs
+++ b/src/librustuv/lib.rs
@@ -34,14 +34,7 @@ via `close` and `delete` methods.
 
 */
 
-#[pkgid="rustuv#0.9-pre"];
-// NOTE: remove after the next snapshot
-#[link(name = "rustuv",
-       package_id = "rustuv",
-       vers = "0.9-pre",
-       uuid = "f3719011-0459-9b86-b11c-29265c0d0864",
-       url = "https://github.com/mozilla/rust/tree/master/src/librustuv")];
-
+#[pkgid = "rustuv#0.9-pre"];
 #[license = "MIT/ASL2"];
 #[crate_type = "rlib"];
 #[crate_type = "dylib"];
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index e2674006215..3ac91a67d7e 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -43,19 +43,11 @@
 //!
 //!     use std::prelude::*;
 
-#[pkgid="std#0.9-pre"];
-// NOTE: remove after the next snapshot
-#[link(name = "std",
-       package_id = "std",
-       vers = "0.9-pre",
-       uuid = "c70c24a7-5551-4f73-8e37-380b11d80be8",
-       url = "https://github.com/mozilla/rust/tree/master/src/libstd")];
-
+#[pkgid = "std#0.9-pre"];
 #[comment = "The Rust standard library"];
 #[license = "MIT/ASL2"];
 #[crate_type = "rlib"];
 #[crate_type = "dylib"];
-
 #[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index 4382e6d67b8..9599f27af04 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -13,13 +13,7 @@
  *  macros.
  */
 
-#[pkgid="syntax#0.9-pre"];
-// NOTE: remove after the next snapshot
-#[link(name = "syntax",
-       package_id = "syntax",
-       vers = "0.9-pre",
-       uuid = "9311401b-d6ea-4cd9-a1d9-61f89499c645")];
-
+#[pkgid = "syntax#0.9-pre"];
 #[license = "MIT/ASL2"];
 #[crate_type = "dylib"];
 #[crate_type = "rlib"];
diff --git a/src/snapshots.txt b/src/snapshots.txt
index f1761b589fe..c2c5512eaef 100644
--- a/src/snapshots.txt
+++ b/src/snapshots.txt
@@ -1,3 +1,11 @@
+S 2013-12-10 b8b16ae
+  freebsd-x86_64 08d28a3a47f4263dc0a005374e59d30b1b942ab2
+  linux-i386 4cd5d8b80014a69dea9744fd12c8cdab6269d263
+  linux-x86_64 b68c106f377b226ebd17210fbce84423e3ffa6c2
+  macos-i386 797b3e01c5ed9fbd3549d75300a005e4a987a84c
+  macos-x86_64 b5f33edc57378ef1533dea258ac04c3bbe0e71da
+  winnt-i386 656ffae4528290f942acf4ac5af515fb802d6bd9
+
 S 2013-12-09 b485e2b
   freebsd-x86_64 424f1504e7dfe43d1238a8b6e6abea8879297fa2
   linux-i386 214dc3cb3224f7ad6ef02e684cf6505113e5dc9a