diff --git a/src/components/main/servo.rs b/src/components/main/servo.rs
index f69cfdae2cd..fcf3f9fd315 100644
--- a/src/components/main/servo.rs
+++ b/src/components/main/servo.rs
@@ -45,19 +45,19 @@ use gfx::font_cache_task::FontCacheTask;
 use servo_util::time::TimeProfiler;
 #[cfg(not(test))]
 use servo_util::memory::MemoryProfiler;
-
 #[cfg(not(test))]
 use servo_util::opts;
 
 #[cfg(not(test))]
-use url::{Url, UrlParser};
-
+use green::GreenTaskBuilder;
 #[cfg(not(test))]
 use std::os;
+#[cfg(not(test))]
+use std::task::TaskBuilder;
 #[cfg(not(test), target_os="android")]
 use std::str;
 #[cfg(not(test))]
-use rustrt::task::TaskOpts;
+use url::{Url, UrlParser};
 
 
 #[cfg(not(test), target_os="linux")]
@@ -111,7 +111,9 @@ pub fn run(opts: opts::Opts) {
     let time_profiler_chan_clone = time_profiler_chan.clone();
 
     let (result_chan, result_port) = channel();
-    pool.spawn(TaskOpts::new(), proc() {
+    TaskBuilder::new()
+        .green(&mut pool)
+        .spawn(proc() {
         let opts = &opts_clone;
         // Create a Servo instance.
         let resource_task = new_resource_task();
diff --git a/src/components/script/dom/dedicatedworkerglobalscope.rs b/src/components/script/dom/dedicatedworkerglobalscope.rs
index 910ea560c1a..2aff963a8e0 100644
--- a/src/components/script/dom/dedicatedworkerglobalscope.rs
+++ b/src/components/script/dom/dedicatedworkerglobalscope.rs
@@ -18,14 +18,13 @@ use script_task::{ScriptTask, ScriptChan};
 use script_task::StackRootTLS;
 
 use servo_net::resource_task::{ResourceTask, load_whole_resource};
-
 use servo_util::str::DOMString;
 
 use js::rust::Cx;
 
 use std::rc::Rc;
-use native;
-use rustrt::task::TaskOpts;
+use std::task::TaskBuilder;
+use native::task::NativeTaskBuilder;
 use url::Url;
 
 #[deriving(Encodable)]
@@ -66,10 +65,10 @@ impl DedicatedWorkerGlobalScope {
                             receiver: Receiver<DOMString>,
                             resource_task: ResourceTask,
                             script_chan: ScriptChan) {
-        let mut task_opts = TaskOpts::new();
-        task_opts.name = Some(format!("Web Worker at {}", worker_url.serialize())
-                              .into_maybe_owned());
-        native::task::spawn_opts(task_opts, proc() {
+        TaskBuilder::new()
+            .native()
+            .named(format!("Web Worker at {}", worker_url.serialize()))
+            .spawn(proc() {
             let roots = RootCollection::new();
             let _stack_roots_tls = StackRootTLS::new(&roots);