diff --git a/LICENSE.txt b/LICENSE.txt
index 4bd8113ac7..f7cae5baae 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -209,8 +209,8 @@ dependencies that have separate copyright notices and license terms. Your
 use of these libraries is subject to the terms and conditions of the 
 following licenses.
 
-For lib/flexjson-1.7.jar, lib/google-collect-1.0-rc1.jar, and
-lib/clhm-production.jar:
+For lib/flexjson-1.7.jar, lib/google-collect-1.0-rc1.jar, 
+lib/clhm-production.jar, and lib/json_simple-1.1.jar:
 
 While developed outside the ASF, these projects are also licensed under
 the Apache License 2.0. The full text of the Apache License 2.0 can be
diff --git a/NOTICE.txt b/NOTICE.txt
index ecc198432a..b03750cb06 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -18,9 +18,12 @@ Written by Cliff Click and released as Public Domain.
 This product makes use of JLine for console input (http://jline.sf.net).
 Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>
 
-JSON support is provided by Flexjson (http://flexjson.sf.net).
+JSON serialization provided by Flexjson (http://flexjson.sf.net).
 Copyright 2007 Charlie Hubbard.
 
+JSON parsing provided by json-simple (http://code.google.com/p/json-simple/).
+Copyright 2006-2009 Yidong Fang.
+
 This product makes use of the JUnit test framework (http://junit.org).
 
 Logging abstraction provided by SLF4J (http://www.slf4j.org).
diff --git a/lib/json_simple-1.1.jar b/lib/json_simple-1.1.jar
new file mode 100644
index 0000000000..f395f41471
Binary files /dev/null and b/lib/json_simple-1.1.jar differ