diff --git a/CHANGES.txt b/CHANGES.txt
index 2b2cf749e86..cfbb76dbada 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -139,6 +139,8 @@ Other Changes
* SOLR-1608: Extract base class from TestDistributedSearch to make
it easy to write test cases for other distributed components. (shalin)
+* Upgraded to Lucene 2.9-dev r888785 (shalin)
+
Build
----------------------
diff --git a/common-build.xml b/common-build.xml
index fdae2af547c..faf14b6ad5b 100644
--- a/common-build.xml
+++ b/common-build.xml
@@ -114,7 +114,7 @@
The version suffix of the Lucene artifacts checked into "lib"
IF YOU CHANGE THIS, SANITY CHECK "javadoc.link.lucene"
-->
-
+
diff --git a/lib/lucene-analyzers-2.9.1-dev.jar b/lib/lucene-analyzers-2.9.1-dev.jar
new file mode 100644
index 00000000000..46ab5107c5a
--- /dev/null
+++ b/lib/lucene-analyzers-2.9.1-dev.jar
@@ -0,0 +1,2 @@
+AnyObjectId[d7bc9e58fa72c17859a93ce837bf1ac638777383] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-analyzers-2.9.1.jar b/lib/lucene-analyzers-2.9.1.jar
deleted file mode 100644
index c06054a0ea2..00000000000
--- a/lib/lucene-analyzers-2.9.1.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[5c79e658db0d404a7acdb3c60fdf4256b5f12dcd] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-collation-2.9.1-dev.jar b/lib/lucene-collation-2.9.1-dev.jar
new file mode 100644
index 00000000000..958fbe9e4ae
--- /dev/null
+++ b/lib/lucene-collation-2.9.1-dev.jar
@@ -0,0 +1,2 @@
+AnyObjectId[d6e97c0d1ca83e811a9e9ad9e865d6e62c40b3df] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-collation-2.9.1.jar b/lib/lucene-collation-2.9.1.jar
deleted file mode 100644
index 1653c7160f9..00000000000
--- a/lib/lucene-collation-2.9.1.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[cb64118ac84bfa90320793fbd581a5454ee02d10] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-core-2.9.1-dev.jar b/lib/lucene-core-2.9.1-dev.jar
new file mode 100644
index 00000000000..a183cc64afe
--- /dev/null
+++ b/lib/lucene-core-2.9.1-dev.jar
@@ -0,0 +1,2 @@
+AnyObjectId[68b87223d7735fcc4b58d2a3839701de5f31094d] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-core-2.9.1.jar b/lib/lucene-core-2.9.1.jar
deleted file mode 100644
index 6c50936b6f9..00000000000
--- a/lib/lucene-core-2.9.1.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[7537dd26e52ba2b62a9b21984213c1d337df96ed] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-highlighter-2.9.1-dev.jar b/lib/lucene-highlighter-2.9.1-dev.jar
new file mode 100644
index 00000000000..8edcf6774c6
--- /dev/null
+++ b/lib/lucene-highlighter-2.9.1-dev.jar
@@ -0,0 +1,2 @@
+AnyObjectId[20f2fe650501298519465c72c57e03a387768d5d] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-highlighter-2.9.1.jar b/lib/lucene-highlighter-2.9.1.jar
deleted file mode 100644
index 5218d8cf37c..00000000000
--- a/lib/lucene-highlighter-2.9.1.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[cb9499b25af0f8c61809177e212efdac906f20e1] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-memory-2.9.1-dev.jar b/lib/lucene-memory-2.9.1-dev.jar
new file mode 100644
index 00000000000..4fa6ae3115f
--- /dev/null
+++ b/lib/lucene-memory-2.9.1-dev.jar
@@ -0,0 +1,2 @@
+AnyObjectId[35da8af3eca3e6c9fa7af1981ed66cc570fa12f0] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-memory-2.9.1.jar b/lib/lucene-memory-2.9.1.jar
deleted file mode 100644
index a152419eaaf..00000000000
--- a/lib/lucene-memory-2.9.1.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[985a5aaf0615faeb2d45693fdd54ddaf3f038723] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-misc-2.9.1-dev.jar b/lib/lucene-misc-2.9.1-dev.jar
new file mode 100644
index 00000000000..1c023ae9cf8
--- /dev/null
+++ b/lib/lucene-misc-2.9.1-dev.jar
@@ -0,0 +1,2 @@
+AnyObjectId[2566f853d3cd47e9176ff3741591c4752ae9a05c] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-misc-2.9.1.jar b/lib/lucene-misc-2.9.1.jar
deleted file mode 100644
index 3bba5c4040c..00000000000
--- a/lib/lucene-misc-2.9.1.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[b54e6864cab3d7d1dc216c5d09ae9414df7f385f] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-queries-2.9.1-dev.jar b/lib/lucene-queries-2.9.1-dev.jar
new file mode 100644
index 00000000000..008a939f476
--- /dev/null
+++ b/lib/lucene-queries-2.9.1-dev.jar
@@ -0,0 +1,2 @@
+AnyObjectId[ce1ec44ba4a40dc8f877fd93c98655bc352fbd25] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-queries-2.9.1.jar b/lib/lucene-queries-2.9.1.jar
deleted file mode 100644
index 7f5c5c22156..00000000000
--- a/lib/lucene-queries-2.9.1.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[bcf5d58dbb3717041cc27c2aebc96c9578892b3c] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-snowball-2.9.1-dev.jar b/lib/lucene-snowball-2.9.1-dev.jar
new file mode 100644
index 00000000000..501143bb353
--- /dev/null
+++ b/lib/lucene-snowball-2.9.1-dev.jar
@@ -0,0 +1,2 @@
+AnyObjectId[49bb821720e18ed3f78185c1bf81ab31ef460dbf] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-snowball-2.9.1.jar b/lib/lucene-snowball-2.9.1.jar
deleted file mode 100644
index 9fe136cf04f..00000000000
--- a/lib/lucene-snowball-2.9.1.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[be926552f7dfed6c880e5853dcc0058f3d67172a] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-spatial-2.9.1-dev.jar b/lib/lucene-spatial-2.9.1-dev.jar
new file mode 100644
index 00000000000..961d49a9e06
--- /dev/null
+++ b/lib/lucene-spatial-2.9.1-dev.jar
@@ -0,0 +1,2 @@
+AnyObjectId[8fa5488b7a4e0feeafd748033732dfa1d4f63d6d] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-spatial-2.9.1.jar b/lib/lucene-spatial-2.9.1.jar
deleted file mode 100644
index 81ebcb4c307..00000000000
--- a/lib/lucene-spatial-2.9.1.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[7920fc6ea65793c1105537691756474dcfbf8554] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-spellchecker-2.9.1-dev.jar b/lib/lucene-spellchecker-2.9.1-dev.jar
new file mode 100644
index 00000000000..4378afc0c28
--- /dev/null
+++ b/lib/lucene-spellchecker-2.9.1-dev.jar
@@ -0,0 +1,2 @@
+AnyObjectId[1985fbeee21b5f3ab1807450a483fa24ccdd058d] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-spellchecker-2.9.1.jar b/lib/lucene-spellchecker-2.9.1.jar
deleted file mode 100644
index 882c4e3aca8..00000000000
--- a/lib/lucene-spellchecker-2.9.1.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[e8f017a03b8e828d63c42c78b98d572560d01337] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file