diff --git a/KEYS b/KEYS
index 4a3000c..b64f0cc 100644
--- a/KEYS
+++ b/KEYS
@@ -65,6 +65,11 @@
 IWC8DKsT+np6ZGfoE58=
 =zb0j
 -----END PGP PUBLIC KEY BLOCK-----
+
+pub   4096R/8EE2F25C 2011-10-24
+uid                  Mahadev Konar (CODE SIGNING KEY) <mahadev@apache.org>
+sub   4096R/1F35DF4C 2011-10-24
+
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: SKS 1.1.0
 
@@ -132,3 +137,62 @@
 7kmI6Gh95bLf1om+Bc8ajpm9Zsw=
 =OYSX
 -----END PGP PUBLIC KEY BLOCK-----
+
+pub   4096R/3ABE18B3 2013-03-21
+uid                  Yusaku Sako (CODE SIGNING KEY) <yusaku@apache.org>
+sub   4096R/F74E5802 2013-03-21
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG/MacGPG2 v2.0.18 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+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
+Ww+qLwIsYPC6XQNrVJpbzg==
+=dBi7
+-----END PGP PUBLIC KEY BLOCK-----
+
diff --git a/NOTICE.txt b/NOTICE.txt
index 1fd4a94..747f4a5 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,14 +1,9 @@
-Apache [2012]
-Copyright [2012] The Apache Software Foundation
+Apache Ambari
+Copyright 2011-2013 The Apache Software Foundation
 
-This product includes software developed by The Apache Software
+This product includes software developed at The Apache Software
 Foundation (http://www.apache.org/).
 
-Component stdlib in puppet modules are under the following copyright: 
-Copyright (C) 2011 Puppet Labs Inc
-and some parts:
-Copyright (C) 2011 Krzysztof Wilczynski
-
 Component ambari-common/src/test/python are under the following copyright:
 
 Copyright (c) 2003-2012, Michael Foord