diff --git a/dev-tools/README.txt b/dev-tools/README.txt
index 0bce3287c80..404ce8ba76f 100644
--- a/dev-tools/README.txt
+++ b/dev-tools/README.txt
@@ -6,7 +6,10 @@ as to the usefulness of the tools.
Description of dev-tools/ contents:
./size-estimator-lucene-solr.xls -- Spreadsheet for estimating memory and disk usage in Lucene/Solr
-./eclipse -- Used to generate project descriptors for the Eclipse IDE.
-./idea -- Similar to Eclipse, but for IntelliJ's IDEA IDE.
-./maven -- Mavenizes the Lucene/Solr packages
-./scripts -- Odds and ends for building releases, etc.
+./doap/ -- Lucene and Solr project descriptors in DOAP RDF format.
+./eclipse/ -- Used to generate project descriptors for the Eclipse IDE.
+./git/ -- Git documentation and resources.
+./idea/ -- Used to generate project descriptors for IntelliJ's IDEA IDE.
+./maven/ -- Mavenizes the Lucene/Solr packages
+./netbeans/ -- Used to generate project descriptors for the Netbeans IDE.
+./scripts/ -- Odds and ends for building releases, etc.
diff --git a/dev-tools/doap/solr.rdf b/dev-tools/doap/solr.rdf
index cc729dcaba1..95a792d03a8 100644
--- a/dev-tools/doap/solr.rdf
+++ b/dev-tools/doap/solr.rdf
@@ -362,28 +362,28 @@
- lucene-4.0-BETA
+ solr-4.0-BETA
2012-08-13
4.0-BETA
- lucene-4.0-ALPHA
+ solr-4.0-ALPHA
2012-07-03
4.0-ALPHA
- lucene-3.6.2
+ solr-3.6.2
2012-12-25
3.6.2
- lucene-3.6.1
+ solr-3.6.1
2012-07-22
3.6.1
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 920f2c6117e..b471988fb84 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -5470,6 +5470,31 @@ Other Changes
* SOLR-6391: Improve message for CREATECOLLECTION failure due to missing
numShards (Anshum Gupta)
+================== 4.9.1 ==================
+
+Versions of Major Components
+---------------------
+Apache Tika 1.5 (with upgraded Apache POI 3.10.1)
+Carrot2 3.9.0
+Velocity 1.7 and Velocity Tools 2.0
+Apache UIMA 2.3.1
+Apache ZooKeeper 3.4.6
+
+Detailed Change List
+----------------------
+
+Other Changes
+---------------------
+
+* SOLR-6503: Removed support for parsing netcdf files in Solr Cell because
+ of license issues. If you need support for this format, download the parser
+ JAR yourself (version 4.2) and add it to contrib/extraction/lib folder:
+ http://www.unidata.ucar.edu/software/thredds/current/netcdf-java/
+ (Uwe Schindler)
+
+* SOLR-6388: Force upgrade of Apache POI dependency in Solr Cell to version
+ 3.10.1 to fix CVE-2014-3529 and CVE-2014-3574. (Uwe Schindler)
+
================== 4.9.0 ==================
Versions of Major Components
@@ -11857,6 +11882,122 @@ Documentation
* SOLR-1792: Documented peculiar behavior of TestHarness.LocalRequestFactory
(hossman)
+================== Release 1.4.1 ==================
+Release Date: See http://lucene.apache.org/solr for the official release date.
+
+Upgrading from Solr 1.4
+-----------------------
+
+This is a bug fix release - no changes are required when upgrading from Solr 1.4.
+However, a reindex is needed for some of the analysis fixes to take effect.
+
+Versions of Major Components
+----------------------------
+Apache Lucene 2.9.3
+Apache Tika 0.4
+Carrot2 3.1.0
+
+Lucene Information
+----------------
+
+Since Solr is built on top of Lucene, many people add customizations to Solr
+that are dependent on Lucene. Please see http://lucene.apache.org/java/2_9_3/,
+especially http://lucene.apache.org/java/2_9_3/changes/Changes.html for more
+information on the version of Lucene used in Solr.
+
+Bug Fixes
+----------------------
+
+* SOLR-1934: Upgrade to Apache Lucene 2.9.3 to obtain several bug
+ fixes from the previous 2.9.1. See the Lucene 2.9.3 release notes
+ for details. (hossman, Mark Miller)
+
+* SOLR-1432: Make the new ValueSource.getValues(context,reader) delegate
+ to the original ValueSource.getValues(reader) so custom sources
+ will work. (yonik)
+
+* SOLR-1572: FastLRUCache correctly implemented the LRU policy only
+ for the first 2B accesses. (yonik)
+
+* SOLR-1595: StreamingUpdateSolrServer used the platform default character
+ set when streaming updates, rather than using UTF-8 as the HTTP headers
+ indicated, leading to an encoding mismatch. (hossman, yonik)
+
+* SOLR-1660: CapitalizationFilter crashes if you use the maxWordCountOption
+ (Robert Muir via shalin)
+
+* SOLR-1662: Added Javadocs in BufferedTokenStream and fixed incorrect cloning
+ in TestBufferedTokenStream (Robert Muir, Uwe Schindler via shalin)
+
+* SOLR-1711: SolrJ - StreamingUpdateSolrServer had a race condition that
+ could halt the streaming of documents. The original patch to fix this
+ (never officially released) introduced another hanging bug due to
+ connections not being released. (Attila Babo, Erik Hetzner via yonik)
+
+* SOLR-1748, SOLR-1747, SOLR-1746, SOLR-1745, SOLR-1744: Streams and Readers
+ retrieved from ContentStreams are not closed in various places, resulting
+ in file descriptor leaks.
+ (Christoff Brill, Mark Miller)
+
+* SOLR-1580: Solr Configuration ignores 'mergeFactor' parameter, always
+ uses Lucene default. (Lance Norskog via Mark Miller)
+
+* SOLR-1777: fieldTypes with sortMissingLast=true or sortMissingFirst=true can
+ result in incorrectly sorted results. (yonik)
+
+* SOLR-1797: fix ConcurrentModificationException and potential memory
+ leaks in ResourceLoader. (yonik)
+
+* SOLR-1798: Small memory leak (~100 bytes) in fastLRUCache for every
+ commit. (yonik)
+
+* SOLR-1522: Show proper message if