diff --git a/_multibuild b/_multibuild
index 1cc75aa..3f8dfb5 100644
--- a/_multibuild
+++ b/_multibuild
@@ -1,6 +1,6 @@
 <multibuild>
-  <package>ant-antlr</package>
-  <package>ant-junit</package>
-  <package>ant-junit5</package>
+  <flavor>antlr</flavor>
+  <flavor>junit</flavor>
+  <flavor>junit5</flavor>
 </multibuild>
 
diff --git a/ant.spec b/ant.spec
index a2e03f1..bfc5cdf 100644
--- a/ant.spec
+++ b/ant.spec
@@ -17,20 +17,21 @@
 #
 
 
+%global flavor @BUILD_FLAVOR@%{nil}
 %global ant_home %{_datadir}/ant
-%if "%{flavor}" == "ant-antlr"
+%if "%{flavor}" == "antlr"
 %bcond_with bootstrap
 %bcond_with junit
 %bcond_with junit5
 %bcond_without antlr
 Name:           ant-antlr
-%elif "%{flavor}" == "ant-junit"
+%elif "%{flavor}" == "junit"
 %bcond_with bootstrap
 %bcond_without junit
 %bcond_with junit5
 %bcond_with antlr
 Name:           ant-junit
-%elif "%{flavor}" == "ant-junit5"
+%elif "%{flavor}" == "junit5"
 %bcond_with bootstrap
 %bcond_with junit
 %bcond_without junit5