diff --git a/DISCLAIMER b/DISCLAIMER
new file mode 100644
index 0000000..950e15d
--- /dev/null
+++ b/DISCLAIMER
@@ -0,0 +1,15 @@
+Apache Kafka is an effort undergoing incubation at the Apache Software
+Foundation (ASF), sponsored by the Apache Incubator PMC.
+
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects.
+
+While incubation status is not necessarily a reflection of the completeness
+or stability of the code, it does indicate that the project has yet to be
+fully endorsed by the ASF.
+
+For more information about the incubation status of the Kafka project you
+can go to the following page:
+
+http://incubator.apache.org/kafka/
\ No newline at end of file
diff --git a/NOTICE b/NOTICE
index c4d6112..1314fb7 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,64 +1,34 @@
-Kafka
+===
+Apache Kafka
+Copyright 2011 The Apache Software Foundation.
 
-This product includes software developed by the Apache Software Foundation (http://www.apache.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+===
 
-This product includes jopt-simple, a library for parsing command line options (http://jopt-simple.sourceforge.net/).
+This product includes jopt-simple, a library for parsing command line
+options (http://jopt-simple.sourceforge.net/).
 
 This product includes junit, developed by junit.org.
 
-This product includes zkclient, developed by Stefan Groschupf, http://github.com/sgroschupf/zkclient
+This product includes zkclient, developed by Stefan Groschupf,
+http://github.com/sgroschupf/zkclient
 
-This produce includes joda-time, developed by joda.org (joda-time.sourceforge.net)
+This produce includes joda-time, developed by joda.org
+(joda-time.sourceforge.net)
 
-This product includes the scala runtime and compiler (www.scala-lang.org) developed by EPFL, which includes the following license:
+This product includes the scala runtime and compiler
+(www.scala-lang.org) developed by EPFL, which includes the following
+license:
 
-This product includes zookeeper, a Hadoop sub-project (http://hadoop.apache.org/zookeeper)
+This product includes easymock, developed by easymock.org
+(http://easymock.org)
 
-This product includes log4j, an Apache project (http://logging.apache.org/log4j)
+This product includes objenesis, developed by Joe Walnes, Henri
+Tremblay, Leonardo Mesquita (http://code.google.com/p/objenesis)
 
-This product includes easymock, developed by easymock.org (http://easymock.org)
+This product includes cglib, developed by sourceforge.net
+(http://cglib.sourceforge.net)
 
-This product includes objenesis, developed by Joe Walnes, Henri Tremblay, Leonardo Mesquita (http://code.google.com/p/objenesis)
-
-This product includes cglib, developed by sourceforge.net (http://cglib.sourceforge.net)
-
-This product includes asm, developed by OW2 consortium (http://asm.ow2.org)
------------------------------------------------------------------------
-
-SCALA LICENSE
-
-Copyright (c) 2002-2010 EPFL, Lausanne, unless otherwise specified.
-All rights reserved.
-
-This software was developed by the Programming Methods Laboratory of the
-Swiss Federal Institute of Technology (EPFL), Lausanne, Switzerland.
-
-Permission to use, copy, modify, and distribute this software in source
-or binary form for any purpose with or without fee is hereby granted,
-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. Neither the name of the EPFL nor the names of its contributors
-      may be used to endorse or promote products derived from this
-      software without specific prior written permission.
-
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS 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 REGENTS OR 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 product includes asm, developed by OW2 consortium
+(http://asm.ow2.org)