diff --git a/announcement/src/main/org/apache/maven/announcement/Formatter.java b/announcement/src/main/org/apache/maven/announcement/Formatter.java
index 67b77356..c828bf13 100644
--- a/announcement/src/main/org/apache/maven/announcement/Formatter.java
+++ b/announcement/src/main/org/apache/maven/announcement/Formatter.java
@@ -1,60 +1,22 @@
 package org.apache.maven.announcement;
 
 /* ====================================================================
- * The Apache Software License, Version 1.1
+ *   Copyright 2001-2004 The Apache Software Foundation.
  *
- * Copyright (c) 2001 The Apache Software Foundation.  All rights
- * reserved.
+ *   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
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" and
- *    "Apache Maven" must not be used to endorse or promote products
- *    derived from this software without prior written permission. For
- *    written permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    "Apache Maven", nor may "Apache" appear in their name, without
- *    prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
+ *       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.
  * ====================================================================
  */
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
@@ -62,7 +24,7 @@ import java.util.StringTokenizer;
 /**
  * @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
  *
- * @version $Id: Formatter.java,v 1.2 2003/11/16 23:29:37 vmassol Exp $
+ * @version $Id: Formatter.java,v 1.3 2004/03/02 14:53:58 evenisse Exp $
  */
 public class Formatter
 {
diff --git a/announcement/xdocs/changes.xml b/announcement/xdocs/changes.xml
index 9883ecbc..c47dd0b3 100644
--- a/announcement/xdocs/changes.xml
+++ b/announcement/xdocs/changes.xml
@@ -8,7 +8,9 @@
   <body>
 
     <release version="1.0" date="in CVS">
-    
+      <action dev="evenisse" tyê="update">
+        Update to ASL v.2
+      </action>
       <action dev="jvanzyl" type="update">
         Remove the need for ${pom} interpolation in properties. The
         use of the maven:property tag is now used to glean a default property.