diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 3cf30e2c38f..0322541ba96 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -564,7 +564,11 @@ Build
can force them to run sequentially by passing -Drunsequential=1 on the command
line. The number of threads that are spwaned per CPU defaults to '1'. If you
wish to change that, you can run the tests with -DthreadsPerProcessor=[num].
- (Robert Muir, Shai Erera, Peter Kofler)
+ (Robert Muir, Shai Erera, Peter Kofler)
+
+* LUCENE-2516: Backwards tests are now compiled against released lucene-core.jar
+ from tarball of previous version. Backwards tests are now packaged together
+ with src distribution. (Uwe Schindler)
Test Cases
diff --git a/lucene/backwards/backwards-readme.txt b/lucene/backwards/backwards-readme.txt
index 0fbd54077ac..4813a909f3a 100644
--- a/lucene/backwards/backwards-readme.txt
+++ b/lucene/backwards/backwards-readme.txt
@@ -4,14 +4,15 @@
This folder contains the src/ folder of the previous Lucene major version.
-The test-backwards ANT task compiles the core classes of the previous version and its tests
-against these class files. After that the compiled test classes are run against the new
-lucene-core.jar file.
+The test-backwards ANT task compiles the previous version's tests (bundled) against the
+previous released lucene-core.jar file (bundled). After that the compiled test classes
+are run against the new lucene-core.jar file, created by ANT before.
After branching a new Lucene major version (branch name "lucene_X_Y") do the following:
-* svn rm backwards/src/
-* svn cp https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_X_Y/lucene/src/ backwards/src/
+* svn rm backwards/src/test
+* svn cp https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_X_Y/lucene/src/test backwards/src/test
+* Copy the lucene-core.jar from the last release tarball to backwards/lib and delete old one.
* Check that everything is correct: The backwards folder should contain a src/ folder
- that now contains java, test, demo,.... The files should be the ones from the branch.
+ that now contains "test". The files should be the ones from the branch.
* Run "ant test-backwards"
diff --git a/lucene/build.xml b/lucene/build.xml
index f0a9d32a01e..da4d777ae3b 100644
--- a/lucene/build.xml
+++ b/lucene/build.xml
@@ -43,7 +43,7 @@
-
-
-
-
-
+
+
+
@@ -81,31 +79,15 @@
-
-
-
-WARNING: Backwards compatibility tests can only be run from SVN checkout.
-The source distribution does not contain sources of the previous Lucene Java version.
-
-
-
+
-
-
-
-
-
-
-
+
+
@@ -113,10 +95,10 @@ The source distribution does not contain sources of the previous Lucene Java ver
-
+
-
+
@@ -134,20 +116,11 @@ The source distribution does not contain sources of the previous Lucene Java ver
-
-
-
-
-
-
-
-
-
-
+
-
+