diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am
index ba9256e9..7e93e5ec 100644
--- a/build-aux/Makefile.am
+++ b/build-aux/Makefile.am
@@ -113,8 +113,12 @@ common: $(xmlo_common)
 
 program-ui: ui/package.strip.js ui/Program.js ui/html/index.phtml
 
+# Handle an intermediate step as we transition to the new compiler
+%.xmli: %.xml
+	cp $< $@
+
 # Individual dependencies appear in suppliers.mk (see below)
-%.xmlo: %.xml $(path_tame)/.rev-xmlo
+%.xmlo: %.xmli $(path_tame)/.rev-xmlo
 	$(TAME_TS)
 	$(TAME) compile $< $@
 
@@ -207,6 +211,7 @@ clean:
 	find -L $(path_suppliers) $(path_map) $(path_c1map) common/ rater/core rater/lv \( \
 		-name '*.xmlo' \
 		-o -name '*.xmle' \
+		-o -name '*.xmli' \
 		-o -name '*.js' \
 		-o -name '*.html' \
 		-o -name '*.dep' \
diff --git a/core/.gitignore b/core/.gitignore
index 7a511723..7d3e9e3e 100644
--- a/core/.gitignore
+++ b/core/.gitignore
@@ -1,5 +1,6 @@
 # when core is built
 *.xmlo
+*.xmli
 *.xmle
 *.js
 *.dep