diff --git a/dspace-discovery/dspace-discovery-xmlui-webapp/pom.xml b/dspace-discovery/dspace-discovery-xmlui-webapp/pom.xml
index ebfe5ea48a..7906208b2c 100644
--- a/dspace-discovery/dspace-discovery-xmlui-webapp/pom.xml
+++ b/dspace-discovery/dspace-discovery-xmlui-webapp/pom.xml
@@ -1,20 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-        Licensed to the Apache Software Foundation (ASF) under one or more
-        contributor license agreements. See the NOTICE file distributed with
-        this work for additional information regarding copyright ownership.
-        The ASF licenses this file to you 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.
-    -->
-<!-- $Id: pom.xml 4739 2010-02-04 16:53:55Z benbosman $ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -123,6 +107,17 @@
                     </systemProperties>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.mycila.maven-license-plugin</groupId>
+                <artifactId>maven-license-plugin</artifactId>
+                <configuration>
+                    <!--Exclude license check for Discovery files which don't need it-->
+                    <excludes>
+                        <exclude>**/*.LICENSE</exclude>
+                        <exclude>**/jquery*</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
             <!--
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/dspace-discovery/dspace-discovery-xmlui-webapp/src/main/webapp/aspects/json-solr.xmap b/dspace-discovery/dspace-discovery-xmlui-webapp/src/main/webapp/aspects/json-solr.xmap
index 20ed005918..e77ab3e7b2 100644
--- a/dspace-discovery/dspace-discovery-xmlui-webapp/src/main/webapp/aspects/json-solr.xmap
+++ b/dspace-discovery/dspace-discovery-xmlui-webapp/src/main/webapp/aspects/json-solr.xmap
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
 
+    The contents of this file are subject to the license and copyright
+    detailed in the LICENSE and NOTICE files at the root of the source
+    tree and available online at
+
+    http://www.dspace.org/license/
+
+-->
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
 
diff --git a/dspace-discovery/dspace-discovery-xmlui-webapp/src/main/webapp/static/js/discovery/LICENSE.txt b/dspace-discovery/dspace-discovery-xmlui-webapp/src/main/webapp/static/js/discovery/LICENSE.txt
deleted file mode 100644
index 03b86605d0..0000000000
--- a/dspace-discovery/dspace-discovery-xmlui-webapp/src/main/webapp/static/js/discovery/LICENSE.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-====
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-====
-Portions of this AJAX Solr is licensed under the Apache License (ASL) v2.0.
\ No newline at end of file
diff --git a/dspace-discovery/dspace-discovery-xmlui-webapp/src/main/webapp/static/js/discovery/COPYRIGHT.txt b/dspace-discovery/dspace-discovery-xmlui-webapp/src/main/webapp/static/js/discovery/ajax-solr.LICENSE
similarity index 71%
rename from dspace-discovery/dspace-discovery-xmlui-webapp/src/main/webapp/static/js/discovery/COPYRIGHT.txt
rename to dspace-discovery/dspace-discovery-xmlui-webapp/src/main/webapp/static/js/discovery/ajax-solr.LICENSE
index 54ac88afe1..6ee2e2cbcf 100644
--- a/dspace-discovery/dspace-discovery-xmlui-webapp/src/main/webapp/static/js/discovery/COPYRIGHT.txt
+++ b/dspace-discovery/dspace-discovery-xmlui-webapp/src/main/webapp/static/js/discovery/ajax-solr.LICENSE
@@ -1,10 +1,7 @@
-====
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
+Portions of this AJAX Solr are licensed under the Apache License (ASL) v2.0.
+
+===
 
-    http://www.dspace.org/license/
-====
 Copyright 2009 Evolving Web Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/dspace-discovery/dspace-discovery-xmlui-webapp/src/main/webapp/static/js/jquery/MIT-LICENSE.txt b/dspace-discovery/dspace-discovery-xmlui-webapp/src/main/webapp/static/js/jquery/jquery.LICENSE
similarity index 82%
rename from dspace-discovery/dspace-discovery-xmlui-webapp/src/main/webapp/static/js/jquery/MIT-LICENSE.txt
rename to dspace-discovery/dspace-discovery-xmlui-webapp/src/main/webapp/static/js/jquery/jquery.LICENSE
index fad61d2121..1f718d9f29 100644
--- a/dspace-discovery/dspace-discovery-xmlui-webapp/src/main/webapp/static/js/jquery/MIT-LICENSE.txt
+++ b/dspace-discovery/dspace-discovery-xmlui-webapp/src/main/webapp/static/js/jquery/jquery.LICENSE
@@ -1,10 +1,3 @@
-====
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-====
 Copyright (c) 2010 John Resig, http://jquery.com/
 
 Permission is hereby granted, free of charge, to any person obtaining