diff --git a/NOTICE b/NOTICE
index ded20cf1..b1e604ce 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,10 +1,15 @@
 cf-warden
 
-Copyright (c) 2012-2015 Pivotal Software, Inc. All Rights Reserved.
+Copyright (c) 2013-Present CloudFoundry.org Foundation, Inc. All Rights Reserved.
 
-This product is licensed to you under the Apache License, Version 2.0 (the "License").  
-You may not use this product except in compliance with the License.  
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-This product may include a number of subcomponents with separate copyright notices 
-and license terms. Your use of these subcomponents is subject to the terms and 
-conditions of the subcomponent's license, as noted in the LICENSE file. 
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.