diff --git a/plexus-sec-dispatcher-build.xml b/plexus-sec-dispatcher-build.xml
index 086a019..418c44b 100644
--- a/plexus-sec-dispatcher-build.xml
+++ b/plexus-sec-dispatcher-build.xml
@@ -65,30 +65,32 @@
 
   <target name="gen-src" description="Generate sources from mdo files">
     <mkdir dir="${build.mdoOutputDir}"/>
-    <exec executable="modello" failonerror="true">
-      <arg value="${build.mdoDir}/settings-security.mdo"/>
-      <arg value="java"/>
-      <arg value="${build.mdoOutputDir}"/>
-      <arg value="1.0.0"/>
-      <arg value="false"/>
-      <arg value="true"/>
-    </exec>
-    <exec executable="modello" failonerror="true">
-      <arg value="${build.mdoDir}/settings-security.mdo"/>
-      <arg value="xpp3-reader"/>
-      <arg value="${build.mdoOutputDir}"/>
-      <arg value="1.0.0"/>
-      <arg value="false"/>
-      <arg value="true"/>
-    </exec>
-    <exec executable="modello" failonerror="true">
-      <arg value="${build.mdoDir}/settings-security.mdo"/>
-      <arg value="xpp3-writer"/>
-      <arg value="${build.mdoOutputDir}"/>
-      <arg value="1.0.0"/>
-      <arg value="false"/>
-      <arg value="true"/>
-    </exec>
+    <macrodef name="modello-single-mode">
+      <attribute name="file"/>
+      <attribute name="mode"/>
+      <attribute name="version"/>
+      <sequential>
+        <exec executable="modello" failonerror="true">
+          <arg file="@{file}"/> <!-- model file -->
+          <arg value="@{mode}"/> <!-- output type -->
+          <arg file="${build.mdoOutputDir}"/> <!-- output directory -->
+          <arg value="@{version}"/> <!-- model version -->
+          <arg value="false"/> <!-- package with version -->
+          <arg value="8"/> <!-- javaSource -->
+        </exec>
+      </sequential>
+    </macrodef>
+    <macrodef name="modello">
+      <attribute name="file"/>
+      <attribute name="version" default="1.0.0"/>
+      <sequential>
+        <echo taskname="modello" message="Generating sources for @{file}"/>
+        <modello-single-mode file="@{file}" version="@{version}" mode="java"/>
+        <modello-single-mode file="@{file}" version="@{version}" mode="xpp3-reader"/>
+        <modello-single-mode file="@{file}" version="@{version}" mode="xpp3-writer"/>
+      </sequential>
+    </macrodef>
+    <modello file="${build.mdoDir}/settings-security.mdo"/>
   </target>
 
   <!-- ====================================================================== -->
diff --git a/plexus-sec-dispatcher.changes b/plexus-sec-dispatcher.changes
index b27d9f7..7877f33 100644
--- a/plexus-sec-dispatcher.changes
+++ b/plexus-sec-dispatcher.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May 13 09:06:37 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Fix build with modello-2.0.0
+
 -------------------------------------------------------------------
 Thu Jan 13 17:21:04 UTC 2022 - Fridrich Strba <fstrba@suse.com>