diff --git a/LICENSE.txt b/LICENSE.txt
index 68300d0b3..336bce75c 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,3 +1,10 @@
+==========================================================================
+The following license applies to software from the
+Apache Software Foundation.
+It also applies to software from the Uncommons Watchmaker and Math
+projects, Google Guava software, and MongoDB.org driver software
+--------------------------------------------------------------------------
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -243,7 +250,28 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 ===================================================
 The following license applies to the SLF4J package
 ===================================================
-Copyright (c) 2004-2008 QOS.ch All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+Copyright (c) 2004-2008 QOS.ch
+ All rights reserved.
+
+ Permission is hereby granted, free  of charge, to any person obtaining
+ a  copy  of this  software  and  associated  documentation files  (the
+ "Software"), to  deal in  the Software without  restriction, including
+ without limitation  the rights to  use, copy, modify,  merge, publish,
+ distribute,  sublicense, and/or sell  copies of  the Software,  and to
+ permit persons to whom the Software  is furnished to do so, subject to
+ the following conditions:
+
+ The  above  copyright  notice  and  this permission  notice  shall  be
+ included in all copies or substantial portions of the Software.
+
+ THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+ EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+ MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 
 ===================================================
 The following license applies to the XMLEnc package
diff --git a/NOTICE.txt b/NOTICE.txt
index 04b483659..b1bd8ee1d 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,30 +1,33 @@
 ==============================================================
  Apache Mahout
- Copyright 2009 The Apache Software Foundation
+ Copyright 2009 and onwards The Apache Software Foundation
 ==============================================================
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
-Includes software from other Apache Software Foundation projects,
+It includes software from other Apache Software Foundation projects,
 including, but not limited to:
   - Apache Lucene Java
+  - Apache Solr
   - Apache Hadoop
   - Apache Commons
 
+This product includes software from the SLF4J project
+  http://www.slf4j.org/
+  Copyright (c) 2004-2008 QOS.ch
+
 This product includes software developed by the Indiana University
   Extreme! Lab (http://www.extreme.indiana.edu/).
   Copyright (c) 2002 Extreme! Lab, Indiana University.
 
 This product includes examples code from the Watchmaker project   
-  https://watchmaker.dev.java.net/
+  http://watchmaker.uncommons.org/
   Copyright (c) 2006-2009 Daniel W. Dyer.
 
-This product includes software developed by the Jets3T project (https://jets3t.dev.java.net/) 
-Copyright (c) 2008 James Murty
-
-This product includes libraries developed by the CGLib project (http://cglib.sourceforge.net/)
-Copyright (c) 2008, cglib
+This product includes code from the Uncommons Math project
+  https://watchmaker.dev.java.net/
+  Copyright (c) 2006-2009 Daniel W. Dyer.
 
 This product includes a JUnit jar: http://junit.sourceforge.net/
 License: Common Public License - v 1.0 (http://junit.sourceforge.net/cpl-v10.html)
@@ -38,7 +41,9 @@ This product includes tests written with EasyMock
 Copyright 2001-2007 Tammo Freese (http://www.easymock.org/)
 
 This product uses the Breast Cancer Wisconsin (Diagnostic) Dataset from the
-UCI Machine Learning Repository [http://www.ics.uci.edu/~mlearn/MLRepository.html, http://archive.ics.uci.edu/ml/datasets/Breast+Cancer+Wisconsin+(Diagnostic)]. 
+UCI Machine Learning Repository
+[http://www.ics.uci.edu/~mlearn/MLRepository.html,
+ http://archive.ics.uci.edu/ml/datasets/Breast+Cancer+Wisconsin+(Diagnostic)].
 
 This product contains parts of the Bayesian Logic (BLOG) Inference Engine.
 Copyright (c) 2005, Regents of the University of California