diff --git a/CHANGES.txt b/CHANGES.txt
index 77a00efecd9f..9df0929f21fa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -147,6 +147,8 @@ Release 0.20.0 - Unreleased
    HBASE-1162  CME in Master in RegionManager.applyActions
    HBASE-1010  IOE on regionserver shutdown because hadn't opened an HLog
    HBASE-1415  Stuck on memcache flush
+   HBASE-1257  base64 encoded values are not contained in quotes during the
+               HBase REST JSON serialization (Brian Beggs via Stack)
 
   IMPROVEMENTS
    HBASE-1089  Add count of regions on filesystem to master UI; add percentage
diff --git a/NOTICE.txt b/NOTICE.txt
index 4fb7d7469353..9e7dd1df4e6a 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -12,6 +12,7 @@ Facebook, Inc. (http://developers.facebook.com/thrift/ -- Page includes the Thri
 
 JUnit (http://www.junit.org/)
 
+The JSON jar source is here: http://www.json.org/java/index.html
 
 Michael Gottesman developed AgileJSON.  Its source code is here:
 
diff --git a/lib/AgileJSON-2.0.jar b/lib/AgileJSON-2.0.jar
deleted file mode 100644
index 906161a9cf7c..000000000000
Binary files a/lib/AgileJSON-2.0.jar and /dev/null differ
diff --git a/lib/AgileJSON-2009-03-30.jar b/lib/AgileJSON-2009-03-30.jar
new file mode 100644
index 000000000000..a17bd2eab018
Binary files /dev/null and b/lib/AgileJSON-2009-03-30.jar differ
diff --git a/lib/json.jar b/lib/json.jar
new file mode 100644
index 000000000000..219760c7ba49
Binary files /dev/null and b/lib/json.jar differ