diff --git a/nav-bsrv-sah-brevbestilling-legacy/pom.xml b/nav-bsrv-sah-brevbestilling-legacy/pom.xml
index 6182274..f77e920 100644
--- a/nav-bsrv-sah-brevbestilling-legacy/pom.xml
+++ b/nav-bsrv-sah-brevbestilling-legacy/pom.xml
@@ -22,6 +22,9 @@
                         <phase>process-sources</phase>
                         <configuration>
                             <defaultOptions>
+                                <bindingFiles>
+                                    <bindingFile>src/main/resources/bindings.xjb</bindingFile>
+                                </bindingFiles>
                                 <extraargs>
                                     <!--change Boolean type getters to getXXX (to ensure status quo with starting point) -->
                                     <extraarg>-xjc-Xbg</extraarg>
@@ -42,6 +45,9 @@
                         <phase>process-sources</phase>
                         <configuration>
                             <defaultOptions>
+                                <bindingFiles>
+                                    <bindingFile>src/main/resources/bindings.xjb</bindingFile>
+                                </bindingFiles>
                                 <extraargs>
                                     <!--change Boolean type getters to getXXX (to ensure status quo with starting point) -->
                                     <extraarg>-xjc-Xbg</extraarg>
diff --git a/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/bindings.xjb b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/bindings.xjb
new file mode 100644
index 0000000..1510e96
--- /dev/null
+++ b/nav-bsrv-sah-brevbestilling-legacy/src/main/resources/bindings.xjb
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jaxb:bindings version="2.1"
+               xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+               xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <!-- "indexed": use Array instead of List -->
+
+    <jaxb:globalBindings collectionType="indexed" generateElementProperty="false">
+        <!-- use Calendar instead of XMLGregorianCalendar -->
+        <jaxb:javaType name="java.util.Calendar" xmlType="xs:dateTime"
+                       parseMethod="javax.xml.bind.DatatypeConverter.parseDateTime"
+                       printMethod="javax.xml.bind.DatatypeConverter.printDateTime"/>
+
+        <jaxb:javaType name="java.util.Calendar" xmlType="xs:date"
+                       parseMethod="javax.xml.bind.DatatypeConverter.parseDate"
+                       printMethod="javax.xml.bind.DatatypeConverter.printDate"/>
+
+        <jaxb:javaType name="java.util.Calendar" xmlType="xs:time"
+                       parseMethod="javax.xml.bind.DatatypeConverter.parseTime"
+                       printMethod="javax.xml.bind.DatatypeConverter.printTime"/>
+
+    </jaxb:globalBindings>
+</jaxb:bindings>
\ No newline at end of file