diff --git a/Makefile.in b/Makefile.in
index 4758e39349f..e96fac06955 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -254,7 +254,7 @@ DONE_script = $(B)src/components/script/libscript.dummy
 DEPS_script = $(CRATE_script) $(SRC_script) $(DONE_SUBMODULES) $(DONE_util) $(DONE_style) $(DONE_net) $(DONE_msg) $(DONE_macros)
 
 RFLAGS_style = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/util
-MAKO_ZIP = $(S)src/components/style/Mako-0.8.1.zip
+MAKO_ZIP = $(S)src/components/style/Mako-0.9.1.zip
 MAKO_style = $(S)src/components/style/properties.rs
 MAKO_SRC_style = $(MAKO_style).mako
 SRC_style = $(call rwildcard,$(S)src/components/style/,*.rs) $(MAKO_style)
@@ -309,7 +309,9 @@ $(AUTOGEN_SRC_script): $(BINDINGS_SRC)/%Binding.rs: $(bindinggen_dependencies) \
 globalgen_dependencies := $(addprefix $(BINDINGS_SRC)/, GlobalGen.py Bindings.conf Configuration.py CodegenRust.py parser/WebIDL.py) $(CACHE_DIR)/.done
 
 $(MAKO_style): $(MAKO_SRC_style)
-	PYTHONPATH=$(MAKO_ZIP) python -c "from mako.template import Template; print(Template(filename='$<').render())" > $@
+# Use a temporary file to avoid writing an empty (but more recent) file on failure.
+	PYTHONPATH=$(MAKO_ZIP) $(CFG_PYTHON2) -c "from mako.template import Template; print(Template(filename='$<').render())" > $@.tmp
+	mv $@.tmp $@
 
 
 $(CACHE_DIR)/.done:
diff --git a/src/components/style/.gitignore b/src/components/style/.gitignore
index babbbcce4e3..79d1b1f5fe2 100644
--- a/src/components/style/.gitignore
+++ b/src/components/style/.gitignore
@@ -1 +1,2 @@
 properties.rs
+properties.rs.tmp
diff --git a/src/components/style/Mako-0.8.1.zip b/src/components/style/Mako-0.8.1.zip
deleted file mode 100644
index c324c72ef8a..00000000000
Binary files a/src/components/style/Mako-0.8.1.zip and /dev/null differ
diff --git a/src/components/style/Mako-0.9.1.zip b/src/components/style/Mako-0.9.1.zip
new file mode 100644
index 00000000000..b7450e30012
Binary files /dev/null and b/src/components/style/Mako-0.9.1.zip differ