diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index 6ebd7afd1..161149b96 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -129,6 +129,10 @@
 					<groupId>javax.servlet</groupId>
 					<artifactId>servlet-api</artifactId>
 				</exclusion>
+                <exclusion>
+                    <groupId>struts</groupId>
+                    <artifactId>struts</artifactId>
+                </exclusion>
 			</exclusions>
         </dependency>
         <dependency>
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index cdf5e01a1..7cf2a5c75 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -127,6 +127,16 @@
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-tools</artifactId>
             <version>1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>struts</groupId>
+                    <artifactId>struts</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
 
diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index 2df8faf1b..2bbce137e 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -44,6 +44,13 @@
         <include>NOTICE*</include>
       </includes>
     </fileSet>
+    <fileSet>
+        <directory>../plugins/struts1/src/main/resources</directory>
+        <outputDirectory></outputDirectory>
+      <includes>
+        <include>ANTLR-LICENSE.txt</include>
+      </includes>
+    </fileSet>
     <fileSet>
       <directory>target/apps</directory>
       <outputDirectory>apps</outputDirectory>
diff --git a/assembly/src/main/assembly/lib-jdk14.xml b/assembly/src/main/assembly/lib-jdk14.xml
index c307c3e81..8a71e107d 100644
--- a/assembly/src/main/assembly/lib-jdk14.xml
+++ b/assembly/src/main/assembly/lib-jdk14.xml
@@ -44,10 +44,9 @@
   </dependencySets>
   <fileSets>
     <fileSet>
-        <directory>src/main/resources</directory>
+        <directory>src/main/resources/backport</directory>
         <outputDirectory></outputDirectory>
       <includes>
-        <include>README*</include>
         <include>*LICENSE*</include>
         <include>NOTICE*</include>
       </includes>
diff --git a/assembly/src/main/assembly/lib.xml b/assembly/src/main/assembly/lib.xml
index e6f7f6d5c..e910f9dad 100644
--- a/assembly/src/main/assembly/lib.xml
+++ b/assembly/src/main/assembly/lib.xml
@@ -44,5 +44,12 @@
         <include>NOTICE*</include>
       </includes>
     </fileSet>
+    <fileSet>
+        <directory>../plugins/struts1/src/main/resources</directory>
+        <outputDirectory></outputDirectory>
+      <includes>
+        <include>ANTLR-LICENSE.txt</include>
+      </includes>
+    </fileSet>
   </fileSets>
 </assembly>
diff --git a/assembly/src/main/resources/NOTICE.txt b/assembly/src/main/resources/NOTICE.txt
index 439eb83b2..e4da995db 100644
--- a/assembly/src/main/resources/NOTICE.txt
+++ b/assembly/src/main/resources/NOTICE.txt
@@ -1,3 +1,10 @@
+Apache Struts
+Copyright 2000-2007 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
+Dojo (http://dojotoolkit.org/).
+domTT (http://www.mojavelinux.com/projects/domtooltip/).
 
+The binary distributions includes the following third party software:
+ANTLR (http://www.antlr.org/).
diff --git a/assembly/src/main/resources/backport/NOTICE.txt b/assembly/src/main/resources/backport/NOTICE.txt
new file mode 100644
index 000000000..f7abb2147
--- /dev/null
+++ b/assembly/src/main/resources/backport/NOTICE.txt
@@ -0,0 +1,7 @@
+Apache Struts
+Copyright 2000-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+Retrotranslator (http://retrotranslator.sourceforge.net/).
+
diff --git a/assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt b/assembly/src/main/resources/backport/RETROTRANSLATOR-LICENSE.txt
similarity index 100%
rename from assembly/src/main/resources/RETROTRANSLATOR-LICENSE.txt
rename to assembly/src/main/resources/backport/RETROTRANSLATOR-LICENSE.txt
diff --git a/core/pom.xml b/core/pom.xml
index 0540bf363..1b731ee55 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -284,6 +284,12 @@
             <artifactId>velocity-tools</artifactId>
             <version>1.3</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>struts</groupId>
+                    <artifactId>struts</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- File upload -->
diff --git a/core/src/main/resources/NOTICE.txt b/core/src/main/resources/NOTICE.txt
index 079532867..41beb5c8e 100644
--- a/core/src/main/resources/NOTICE.txt
+++ b/core/src/main/resources/NOTICE.txt
@@ -3,4 +3,4 @@ Copyright 2000-2007 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
-Dojo (http://dojotoolkit.org/).
+domTT (http://www.mojavelinux.com/projects/domtooltip/).
\ No newline at end of file
diff --git a/plugins/dojo/src/main/resources/NOTICE.txt b/plugins/dojo/src/main/resources/NOTICE.txt
new file mode 100644
index 000000000..079532867
--- /dev/null
+++ b/plugins/dojo/src/main/resources/NOTICE.txt
@@ -0,0 +1,6 @@
+Apache Struts
+Copyright 2000-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+Dojo (http://dojotoolkit.org/).
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 890b876fa..04aeb326d 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -68,6 +68,12 @@
             <artifactId>velocity-tools</artifactId>
             <version>1.3</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>struts</groupId>
+                    <artifactId>struts</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- Portlet -->
diff --git a/plugins/sitemesh/pom.xml b/plugins/sitemesh/pom.xml
index 5695ad7bb..5018530b1 100644
--- a/plugins/sitemesh/pom.xml
+++ b/plugins/sitemesh/pom.xml
@@ -59,6 +59,12 @@
             <artifactId>velocity-tools</artifactId>
             <version>1.3</version>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>struts</groupId>
+                    <artifactId>struts</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
 
diff --git a/plugins/struts1/src/main/resources/ANTLR-LICENSE.txt b/plugins/struts1/src/main/resources/ANTLR-LICENSE.txt
new file mode 100644
index 000000000..1d1d5d644
--- /dev/null
+++ b/plugins/struts1/src/main/resources/ANTLR-LICENSE.txt
@@ -0,0 +1,26 @@
+[The "BSD licence"]
+Copyright (c) 2003-2006 Terence Parr
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/plugins/struts1/src/main/resources/NOTICE.txt b/plugins/struts1/src/main/resources/NOTICE.txt
index cd13ec449..2ca45c6d6 100644
--- a/plugins/struts1/src/main/resources/NOTICE.txt
+++ b/plugins/struts1/src/main/resources/NOTICE.txt
@@ -2,4 +2,7 @@ Apache Struts
 Copyright 2000-2007 The Apache Software Foundation
 
 This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
+The Apache Software Foundation (http://www.apache.org/).
+
+The binary distributions includes the following third party software:
+ANTLR (http://www.antlr.org/).