diff --git a/Cargo.toml b/Cargo.toml
index 2c2c1ac9..32a1495d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cssparser"
-version = "0.23.5"
+version = "0.23.6"
 authors = [ "Simon Sapin <simon.sapin@exyr.org>" ]
 
 description = "Rust implementation of CSS Syntax Level 3"
diff --git a/build.rs b/build.rs
index 70339f46..54fea6a5 100644
--- a/build.rs
+++ b/build.rs
@@ -15,7 +15,7 @@ use std::path::Path;
 #[cfg(feature = "dummy_match_byte")]
 mod codegen {
     use std::path::Path;
-    pub fn main(_: &Path) {}
+    pub fn main() {}
 }
 
 #[cfg(not(feature = "dummy_match_byte"))]
@@ -27,11 +27,21 @@ mod codegen {
     use match_byte;
     use std::env;
     use std::path::Path;
+    use std::thread::Builder;
 
-    pub fn main(tokenizer_rs: &Path) {
-        match_byte::expand(tokenizer_rs,
-                           &Path::new(&env::var("OUT_DIR").unwrap()).join("tokenizer.rs"));
+    pub fn main() {
+        let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
 
+        let input = Path::new(&manifest_dir).join("src/tokenizer.rs");
+        let output = Path::new(&env::var("OUT_DIR").unwrap()).join("tokenizer.rs");
+        println!("cargo:rerun-if-changed={}", input.display());
+
+        // We have stack overflows on Servo's CI.
+        let handle = Builder::new().stack_size(8 * 1024 * 1024).spawn(move || {
+            match_byte::expand(&input, &output);
+        }).unwrap();
+
+        handle.join().unwrap();
     }
 }
 
@@ -41,8 +51,5 @@ fn main() {
         println!("cargo:rustc-cfg=rustc_has_pr45225")
     }
 
-    let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
-    let tokenizer_rs = Path::new(&manifest_dir).join("src/tokenizer.rs");
-    codegen::main(&tokenizer_rs);
-    println!("cargo:rerun-if-changed={}", tokenizer_rs.display());
+    codegen::main();
 }