diff --git a/README.md b/README.md
index 881ba03798..4ff5ab769a 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ You need a few things to run rustboot:
 1. `qemu`
 2. a cross-compiler for i386
 3. `nasm`
-4. Rust's `incoming` branch.
+4. Rust's `master` branch or 0.7 release.
 
 ### OSX
 
@@ -45,7 +45,6 @@ To get edge Rust going, grab it from git:
 ```bash
 $ git clone https://github.com/mozilla/rust
 $ cd rust
-$ git checkout incoming
 $ ./configure --prefix=/Users/steve
 $ make && make install
 ```
diff --git a/linker.ld b/linker.ld
index 0a7b087788..f5bebf8b23 100644
--- a/linker.ld
+++ b/linker.ld
@@ -1,10 +1,21 @@
 ENTRY(start)
 OUTPUT_FORMAT(binary)
 
+MEMORY {
+    ram : org = 0x7e00, l = 12K
+}
+
 SECTIONS {
     . = 0x7e00;
 
     .text : {
+        runtime.o(.text)
         *(.text)
+    } >ram
+
+    /DISCARD/ : {
+        *(.comment)
+        *(.eh_frame)
+        *(.rel.eh_frame)
     }
 }
diff --git a/main b/main
new file mode 100755
index 0000000000..83687099e6
Binary files /dev/null and b/main differ
diff --git a/main.rs b/main.rs
index 565b21f4e0..925ab969a0 100644
--- a/main.rs
+++ b/main.rs
@@ -1,3 +1,6 @@
+#[link(name = "rustboot",
+       vers = "0.0",
+       license = "MIT")];
 #[allow(ctypes)];
 #[no_std];
 #[no_core];
diff --git a/zero.rs b/zero.rs
index 3bb16c3128..b8e4535801 100644
--- a/zero.rs
+++ b/zero.rs
@@ -58,6 +58,8 @@ pub trait TyVisitor {}
 #[lang="closure_exchange_malloc"]
 pub trait ClosureExchangeMalloc {}
 
+#[lang="vector_exchange_malloc"]
+
 #[lang="send"]
 pub trait Send {}