diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 741efb4c2a6..c106675e2c3 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -399,18 +399,6 @@ New Features
 * SOLR-2010: Added ability to verify that spell checking collations have
    actual results in the index.  (James Dyer via gsingers)
 
-* SOLR-2210: Add icu-based tokenizer and filters to contrib/analysis-extras (rmuir)
-
-* SOLR-1336: Add SmartChinese (word segmentation for Simplified Chinese) 
-  tokenizer and filters to contrib/analysis-extras (rmuir)
-
-* SOLR-2211,LUCENE-2763: Added UAX29URLEmailTokenizerFactory, which implements
-  UAX#29, a unicode algorithm with good results for most languages, as well as
-  URL and E-mail tokenization according to the relevant RFCs.
-  (Tom Burton-West via rmuir)
-
-* SOLR-2237: Added StempelPolishStemFilterFactory to contrib/analysis-extras (rmuir)
-
 * SOLR-2188: Added "maxTokenLength" argument to the factories for ClassicTokenizer,
   StandardTokenizer, and UAX29URLEmailTokenizer. (Steven Rowe)
 
@@ -435,9 +423,6 @@ Optimizations
 
 * SOLR-2046: add common functions to scripts-util. (koji)
 
-* SOLR-2200: Improve the performance of DataImportHandler for large delta-import
-  updates. (Mark Waddle via rmuir)
-
 Bug Fixes
 ----------------------
 * SOLR-1432: Make the new ValueSource.getValues(context,reader) delegate
@@ -573,8 +558,6 @@ Bug Fixes
   by making SolreCore close the UpdateHandler before closing the
   SearchExecutor.  (NarasimhaRaju, hossman)
 
-* SOLR-1902: Upgraded Tika to 0.8-SNAPSHOT (gsingers)
-
 * SOLR-2036: Avoid expensive fieldCache ram estimation for the
   admin stats page. (yonik)
 
@@ -630,9 +613,6 @@ Bug Fixes
   SingleResponseWriter.end to be called 2x 
   (Chris A. Mattmann via hossman) 
   
-* SOLR-2252: When a child entity in nested entities is rootEntity="true", delta-import doesn't work.
-  (koji)
-
 * SOLR-2219: The init() method of every SolrRequestHandler was being
   called twice. (ambikeshwar singh and hossman)
 
@@ -714,9 +694,6 @@ Other Changes
   "defaultSearchField" as the default value for the "qf" param instead of failing
   with an error when "qf" is not specified.  (hossman)
 
-* SOLR-1821: Fix TimeZone-dependent test failure in TestEvaluatorBag.
-  (Chris Male via rmuir)
-
 * SOLR-1851: luceneAutoCommit no longer has any effect - it has been remove (Mark Miller)
 
 * SOLR-1865: SolrResourceLoader.getLines ignores Byte Order Markers (BOMs) at the
diff --git a/solr/contrib/analysis-extras/CHANGES.txt b/solr/contrib/analysis-extras/CHANGES.txt
new file mode 100644
index 00000000000..e512decaa99
--- /dev/null
+++ b/solr/contrib/analysis-extras/CHANGES.txt
@@ -0,0 +1,30 @@
+                    Apache Solr - Analysis Extras
+                            Release Notes
+
+Introduction
+------------
+The analysis-extras plugin provides additional analyzers that rely
+upon large dependencies/dictionaries.
+
+It includes integration with ICU for multilingual support, and 
+analyzers for Chinese and Polish.
+
+
+$Id$
+================== Release 4.0-dev ==================
+
+(No Changes)
+
+================== Release 3.1-dev ==================
+
+* SOLR-2210: Add icu-based tokenizer and filters to contrib/analysis-extras (rmuir)
+
+* SOLR-1336: Add SmartChinese (word segmentation for Simplified Chinese) 
+  tokenizer and filters to contrib/analysis-extras (rmuir)
+
+* SOLR-2211,LUCENE-2763: Added UAX29URLEmailTokenizerFactory, which implements
+  UAX#29, a unicode algorithm with good results for most languages, as well as
+  URL and E-mail tokenization according to the relevant RFCs.
+  (Tom Burton-West via rmuir)
+
+* SOLR-2237: Added StempelPolishStemFilterFactory to contrib/analysis-extras (rmuir)
diff --git a/solr/contrib/clustering/CHANGES.txt b/solr/contrib/clustering/CHANGES.txt
index a350571fb4f..2bf66fa5f01 100644
--- a/solr/contrib/clustering/CHANGES.txt
+++ b/solr/contrib/clustering/CHANGES.txt
@@ -7,8 +7,11 @@ See http://wiki.apache.org/solr/ClusteringComponent
 CHANGES
 
 $Id$
+================== Release 4.0.0-dev ==================
 
-================== Release XXXX ==================
+(No Changes)
+
+================== Release 3.1.0-dev ==================
 
 * SOLR-1684: Switch to use the SolrIndexSearcher.doc(int, Set<String>) method b/c it can use the document cache (gsingers)
 
diff --git a/solr/contrib/clustering/DISABLED-README.txt b/solr/contrib/clustering/DISABLED-README.txt
deleted file mode 100644
index 8a43dbda63d..00000000000
--- a/solr/contrib/clustering/DISABLED-README.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-In trunk this contrib module is currently disabled, as it uses the external
-(binary) Carrot2 library (as trunk is free to change its API, this module fails
-with linking exceptions).
-
-After a stable branch of Lucene is created from trunk, rename
-'build.xml.disabled' back to 'build.xml' after replacing the Carrot2
-JARs by updated versions.
diff --git a/solr/contrib/clustering/build.xml.disabled b/solr/contrib/clustering/build.xml.disabled
deleted file mode 100644
index c5cb3af4548..00000000000
--- a/solr/contrib/clustering/build.xml.disabled
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You 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
- 
-        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.
- -->
-
-<project name="solr-clustering" default="build">
-
-  <property name="solr-path" value="../.."/>
-
-  <import file="../../common-build.xml"/>
-
-  <description>
-    Clustering Integraton
-  </description>
-
-  <property name="download.dir" value="lib/downloads"/>
-  <property name="example.local" value="example"/>
-  
-  <path id="common.classpath">
-    <fileset dir="lib"/>
-    <fileset dir="${download.dir}"/>
-    <pathelement location="${solr-path}/build/solr"/>
-    <pathelement location="${solr-path}/build/solrj"/>
-    <path refid="lucene.classpath"/>
-    <fileset dir="${solr-path}/lib" includes="*.jar"/>
-  </path>
-
-  <path id="test.classpath">
-    <pathelement path="${dest}/classes"/>
-    <pathelement path="${dest}/test-classes"/>
-    <pathelement path="${java.class.path}"/>
-    <pathelement location="${common-solr.dir}/build/tests"/> <!-- include solr test code -->
-    <pathelement location="${common-solr.dir}/../lucene/build/classes/test" />  <!-- include some lucene test code -->
-    <path refid="common.classpath"/>
-  </path>
-
-  <target name="clean">
-    <delete failonerror="false" dir="${dest}"/>
-
-    <!-- example doesn't create this anymore, but clean it up
-         if it's still there from an old build
-      -->
-    <delete dir="example/lib" />
-  </target>
-  <target name="clean-downloads">
-    <delete>
-      <fileset dir="${download.dir}"/>
-    </delete>
-  </target>
-
-  <target name="init">
-    <mkdir dir="${dest}/classes"/>
-    <mkdir dir="${download.dir}" />
-    <mkdir dir="${build.javadoc}"/>
-    <ant dir="../../" inheritall="false" target="compileTests"/> <!-- compiles src and tests -->
-    <ant dir="../../" inheritall="false" target="make-manifest"/>
-  </target>
-
-  <target name="check-files" depends="proxy.setup">
-    <available file="${download.dir}/colt-1.2.0.jar" property="colt.exists"/>
-    <available file="${download.dir}/pcj-1.2.jar" property="pcj.exists"/>
-    <available file="${download.dir}/nni-1.0.0.jar" property="nni.exists"/>
-    <available file="${download.dir}/simple-xml-1.7.3.jar" property="simplexml.exists"/>
-  </target>
-  <!-- http://mirrors.ibiblio.org/pub/mirrors/maven2/org/simpleframework/simple-xml/1.7.3/simple-xml-1.7.3.jar -->
-  <target name="get-colt" depends="check-files" unless="colt.exists">
-    <!-- Get the LGPL deps and put them in a separate dir -->
-    <get src="http://repo1.maven.org/maven2/colt/colt/1.2.0/colt-1.2.0.jar" dest="${download.dir}/colt-1.2.0.jar"/>
-  </target>
-  <target name="get-nni" depends="check-files" unless="nni.exists">
-    <!-- Get the LGPL deps and put them in a separate dir -->
-    <get src="http://download.carrot2.org/maven2/org/carrot2/nni/1.0.0/nni-1.0.0.jar"
-         dest="${download.dir}/nni-1.0.0.jar"/>
-  </target>
-
-  <!-- Compile time dep. only -->
-  <target name="get-simple-xml" depends="check-files" unless="simplexml.exists">
-    <!-- Get the LGPL deps and put them in a separate dir -->
-    <get src="http://mirrors.ibiblio.org/pub/mirrors/maven2/org/simpleframework/simple-xml/1.7.3/simple-xml-1.7.3.jar"
-         dest="${download.dir}/simple-xml-1.7.3.jar"/>
-
-  </target>
-  <target name="get-pcj" depends="check-files" unless="pcj.exists">
-    <!-- Get the LGPL deps and put them in a separate dir -->
-    <get src="http://repo1.maven.org/maven2/pcj/pcj/1.2/pcj-1.2.jar" dest="${download.dir}/pcj-1.2.jar"/>
-  </target>
-  <target name="get-libraries" depends="init, get-colt, get-pcj, get-nni, get-simple-xml"/>
-
-  <target name="compile" depends="init, get-libraries">
-    <solr-javac destdir="${dest}/classes"
-                classpathref="common.classpath">
-      <src path="src/main/java"/>
-    </solr-javac>
-  </target>
-
-  <target name="build" depends="compile">
-    <solr-jar destfile="${dest}/${fullnamever}.jar" basedir="${dest}/classes"
-              manifest="../../${dest}/META-INF/MANIFEST.MF"/>
-  </target>
-
-  <target name="compileTests" depends="compile">
-    <solr-javac destdir="${dest}/test-classes"
-                classpathref="test.classpath">
-      <src path="src/test/java"/>
-    </solr-javac>
-  </target>
-
-  <target name="example" depends="build,dist">
-    <!-- this task use to copy lib's but that's no longer needed because
-         ../lib and ../lib/downloads are now included explicitly by
-         example/conf/solrconfig.xml
-      -->
-  </target>
-
-
-  <target name="test" depends="compileTests">
-    <mkdir dir="${junit.output.dir}"/>
-
-    <junit printsummary="on"
-           haltonfailure="no"
-           maxmemory="512M"
-           errorProperty="tests.failed"
-           failureProperty="tests.failed"
-           dir="src/test/resources/"
-           tempdir="${junit.output.dir}"
-            >
-      <formatter type="brief" usefile="false" if="junit.details"/>
-      <classpath refid="test.classpath"/>
-      <assertions>
-        <enable package="org.apache.lucene"/>
-        <enable package="org.apache.solr"/>
-      </assertions>
-      <formatter type="xml"/>
-      <batchtest fork="yes" todir="${junit.output.dir}" unless="testcase">
-        <fileset dir="src/test/java" includes="${junit.includes}">
-          <exclude name="**/AbstractClusteringTest*"/>
-        </fileset>
-      </batchtest>
-      <batchtest fork="yes" todir="${junit.output.dir}" if="testcase">
-        <fileset dir="src/test/java" includes="**/${testcase}.java"/>
-      </batchtest>
-    </junit>
-
-    <fail if="tests.failed">Tests failed!</fail>
-  </target>
-
-  <target name="dist" depends="build">
-    <!--
-      <copy file="${dest}/${fullnamever}.jar" todir="${solr-path}/build/web/WEB-INF/lib"/>
-      <copy todir="${solr-path}/build/web/WEB-INF/lib" flatten="true">
-        <fileset dir="lib">
-          <include name="**/*.jar"/>
-        </fileset>
-      </copy>
-    -->
-    <copy file="${dest}/${fullnamever}.jar" todir="${solr-path}/dist"/>
-  </target>
-
-  <target name="javadoc">
-    <sequential>
-      <mkdir dir="${build.javadoc}/contrib-${name}"/>
-
-      <path id="javadoc.classpath">
-        <path refid="common.classpath"/>
-      </path>
-
-      <invoke-javadoc
-              destdir="${build.javadoc}/contrib-${name}"
-              title="${Name} ${version} contrib-${fullnamever} API">
-        <sources>
-          <packageset dir="src/main/java"/>
-        </sources>
-      </invoke-javadoc>
-    </sequential>
-  </target>
-
-</project>
diff --git a/solr/contrib/dataimporthandler/CHANGES.txt b/solr/contrib/dataimporthandler/CHANGES.txt
index dcd0185895b..0391b5816a8 100644
--- a/solr/contrib/dataimporthandler/CHANGES.txt
+++ b/solr/contrib/dataimporthandler/CHANGES.txt
@@ -9,6 +9,10 @@ HTTP data sources quick and easy.
 
 $Id$
 ==================  4.0.0-dev ==================
+
+(No Changes)
+
+==================  3.1.0-dev ==================
 Upgrading from Solr 1.4
 ----------------------
 
@@ -44,6 +48,9 @@ New Features
 Optimizations
 ----------------------
 
+* SOLR-2200: Improve the performance of DataImportHandler for large delta-import
+  updates. (Mark Waddle via rmuir)
+  
 Bug Fixes
 ----------------------
 * SOLR-1638: Fixed NullPointerException during import if uniqueKey is not specified
@@ -68,9 +75,14 @@ Bug Fixes
 * SOLR-2310: getTimeElapsedSince() returns incorrect hour value when the elapse is over 60 hours
   (tom liu via koji)
 
+* SOLR-2252: When a child entity in nested entities is rootEntity="true", delta-import doesn't work.
+  (koji)
+
 Other Changes
 ----------------------
 
+* SOLR-1821: Fix TimeZone-dependent test failure in TestEvaluatorBag.
+  (Chris Male via rmuir)
 
 Build
 ----------------------
diff --git a/solr/contrib/extraction/CHANGES.txt b/solr/contrib/extraction/CHANGES.txt
index 86d23bda34c..4309db21b21 100644
--- a/solr/contrib/extraction/CHANGES.txt
+++ b/solr/contrib/extraction/CHANGES.txt
@@ -24,9 +24,13 @@ Current Version: Tika 0.8 (released 11/07/2010)
 
 $Id:$
 
+================== Release 4.0-dev ==================
+
+(No Changes)
+
 ================== Release 3.1-dev ==================
 
-* Upgraded to Tika 0.8 and changed deprecated parse call
+* SOLR-1902: Upgraded to Tika 0.8 and changed deprecated parse call
 
 * SOLR-1756: The date.format setting causes ClassCastException when enabled and the config code that
   parses this setting does not properly use the same iterator instance. (Christoph Brill, Mark Miller)