diff --git a/Makefile.in b/Makefile.in
index e1ea931488b..9a691bd2fb9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -236,8 +236,8 @@ DONE_script = $(B)src/components/script/libscript.dummy
 DEPS_script = $(CRATE_script) $(SRC_script) $(DONE_SUBMODULES) $(DONE_util) $(DONE_net) $(DONE_gfx) $(DONE_msg)
 
 RFLAGS_style = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/util -L $(B)src/components/script -L $(B)src/components/gfx -L $(B)src/components/net -L $(B)src/components/msg
-MAKO_ZIP = $(S)src/components/style/properties/Mako-0.8.1.zip
-MAKO_style = $(S)src/components/style/properties/mod.rs
+MAKO_ZIP = $(S)src/components/style/Mako-0.8.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)
 CRATE_style = $(S)src/components/style/style.rc
diff --git a/src/components/style/.gitignore b/src/components/style/.gitignore
new file mode 100644
index 00000000000..babbbcce4e3
--- /dev/null
+++ b/src/components/style/.gitignore
@@ -0,0 +1 @@
+properties.rs
diff --git a/src/components/style/properties/Mako-0.8.1.zip b/src/components/style/Mako-0.8.1.zip
similarity index 100%
rename from src/components/style/properties/Mako-0.8.1.zip
rename to src/components/style/Mako-0.8.1.zip
diff --git a/src/components/style/properties/common_types.rs b/src/components/style/common_types.rs
similarity index 100%
rename from src/components/style/properties/common_types.rs
rename to src/components/style/common_types.rs
diff --git a/src/components/style/properties/mod.rs.mako b/src/components/style/properties.rs.mako
similarity index 100%
rename from src/components/style/properties/mod.rs.mako
rename to src/components/style/properties.rs.mako
diff --git a/src/components/style/properties/.gitignore b/src/components/style/properties/.gitignore
deleted file mode 100644
index 73abffdd5d0..00000000000
--- a/src/components/style/properties/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-mod.rs