diff --git a/exist-start/Mortbay-APACHE-2-license.template.txt b/exist-start/Mortbay-APACHE-2-license.template.txt
new file mode 100644
index 00000000000..61339239310
--- /dev/null
+++ b/exist-start/Mortbay-APACHE-2-license.template.txt
@@ -0,0 +1,11 @@
+Copyright 2002-2005 Mort Bay Consulting Pty. Ltd.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
\ No newline at end of file
diff --git a/exist-start/pom.xml b/exist-start/pom.xml
index f1ecf95e879..ccac0cb450d 100644
--- a/exist-start/pom.xml
+++ b/exist-start/pom.xml
@@ -51,48 +51,46 @@
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
                 <configuration>
-                    <excludes>
+                    <licenseSets>
+                        <licenseSet>
+                            <!--
+                                eXist-db's License
+                            -->
+                            <header>${project.parent.relativePath}/LGPL-21-license.template.txt</header>
 
-                        <!--
-                            Derivative work licensed under Apache 2.0 and LGPL 2.1
-                        -->
-                        <exclude>src/main/java/org/exist/start/Classpath.java</exclude>
-                        <exclude>src/main/java/org/exist/start/Main.java</exclude>
-                        <exclude>src/main/java/org/exist/start/Version.java</exclude>
-
-                    </excludes>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>check-headers</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-
-                    <!-- TODO(AR) the below execution doesn't appear to do anything we need to investigate this! -->
-                    <execution>
-                        <!--
-                            Derivative work licensed under Apache 2.0 and LGPL 2.1
-                        -->
-                        <id>check-dbxml-headers</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <excludes/>
-                            <includes>
+                            <!--
+                                Derivative work licensed under Apache 2.0 and LGPL 2.1
+                            -->
+                            <excludes>
+                                <exclude>Mortbay-APACHE-2-license.template.txt</exclude>
                                 <exclude>src/main/java/org/exist/start/Classpath.java</exclude>
                                 <exclude>src/main/java/org/exist/start/Main.java</exclude>
                                 <exclude>src/main/java/org/exist/start/Version.java</exclude>
+                            </excludes>
+
+                        </licenseSet>
+
+                        <licenseSet>
+                            <!--
+                                Derivative work licensed under Apache 2.0 and LGPL 2.1
+                            -->
+                            <multi>
+                                <preamble><![CDATA[NOTE: This file is in part based on code from Mort Bay Consulting.
+The original license statement is also included below.]]></preamble>
+                                <header>${project.parent.relativePath}/LGPL-21-license.template.txt</header>
+                                <header>Mortbay-APACHE-2-license.template.txt</header>
+                            </multi>
+                            <excludes/>
+                            <includes>
+                                <include>src/main/java/org/exist/start/Classpath.java</include>
+                                <include>src/main/java/org/exist/start/Main.java</include>
+                                <include>src/main/java/org/exist/start/Version.java</include>
                             </includes>
-                            <encoding>${project.build.sourceEncoding}</encoding>
-                        </configuration>
-                    </execution>
-                </executions>
+                        </licenseSet>
+
+                    </licenseSets>
+
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/exist-start/src/main/java/org/exist/start/Classpath.java b/exist-start/src/main/java/org/exist/start/Classpath.java
index 5ccc4caf79b..dd9d2c40ef9 100644
--- a/exist-start/src/main/java/org/exist/start/Classpath.java
+++ b/exist-start/src/main/java/org/exist/start/Classpath.java
@@ -1,4 +1,7 @@
 /*
+ * NOTE: This file is in part based on code from Mort Bay Consulting.
+ * The original license statement is also included below.
+ *
  * eXist-db Open Source Native XML Database
  * Copyright (C) 2001 The eXist-db Authors
  *
@@ -19,11 +22,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
+ * ---------------------------------------------------------------------
  *
- * NOTE: This file is in part based on code from the Mort Bay Consulting.
- * The original license statement is included below:
- *
- * ----------------------------------------------------------------------------
  * Copyright 2002-2005 Mort Bay Consulting Pty. Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/exist-start/src/main/java/org/exist/start/Main.java b/exist-start/src/main/java/org/exist/start/Main.java
index dc26d0f78b8..5bc6622b250 100644
--- a/exist-start/src/main/java/org/exist/start/Main.java
+++ b/exist-start/src/main/java/org/exist/start/Main.java
@@ -1,4 +1,7 @@
 /*
+ * NOTE: This file is in part based on code from Mort Bay Consulting.
+ * The original license statement is also included below.
+ *
  * eXist-db Open Source Native XML Database
  * Copyright (C) 2001 The eXist-db Authors
  *
@@ -19,11 +22,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
+ * ---------------------------------------------------------------------
  *
- * NOTE: This file is in part based on code from the Mort Bay Consulting.
- * The original license statement is included below:
- *
- * ----------------------------------------------------------------------------
  * Copyright 2002-2005 Mort Bay Consulting Pty. Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/exist-start/src/main/java/org/exist/start/Version.java b/exist-start/src/main/java/org/exist/start/Version.java
index daa154e444e..7c5d07dce48 100644
--- a/exist-start/src/main/java/org/exist/start/Version.java
+++ b/exist-start/src/main/java/org/exist/start/Version.java
@@ -1,4 +1,7 @@
 /*
+ * NOTE: This file is in part based on code from Mort Bay Consulting.
+ * The original license statement is also included below.
+ *
  * eXist-db Open Source Native XML Database
  * Copyright (C) 2001 The eXist-db Authors
  *
@@ -19,11 +22,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
+ * ---------------------------------------------------------------------
  *
- * NOTE: This file is in part based on code from the Mort Bay Consulting.
- * The original license statement is included below:
- *
- * ----------------------------------------------------------------------------
  * Copyright 2002-2005 Mort Bay Consulting Pty. Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");