diff --git a/lucene/build.xml b/lucene/build.xml
index 5e4dec714e2..e55289e8c74 100644
--- a/lucene/build.xml
+++ b/lucene/build.xml
@@ -347,7 +347,6 @@ The source distribution does not contain sources of the previous Lucene Java ver
-
@@ -376,7 +375,6 @@ The source distribution does not contain sources of the previous Lucene Java ver
-
@@ -611,7 +609,7 @@ The source distribution does not contain sources of the previous Lucene Java ver
-
+
@@ -623,7 +621,7 @@ The source distribution does not contain sources of the previous Lucene Java ver
-
+
@@ -655,13 +653,6 @@ The source distribution does not contain sources of the previous Lucene Java ver
antfile="build.xml"
/>
-
-
-
-
diff --git a/lucene/contrib/CHANGES.txt b/lucene/contrib/CHANGES.txt
index e02efbf1ced..da4baa787e7 100644
--- a/lucene/contrib/CHANGES.txt
+++ b/lucene/contrib/CHANGES.txt
@@ -126,8 +126,8 @@ Build
(Steven Rowe, Robert Muir)
* LUCENE-2323: Moved contrib/regex into contrib/queries. Moved the
- queryparsers under contrib/misc into contrib/queryparser. Moved
- contrib/fast-vector-highlighter into contrib/highlighter. (Robert Muir)
+ queryparsers under contrib/misc and contrib/surround into contrib/queryparser.
+ Moved contrib/fast-vector-highlighter into contrib/highlighter. (Robert Muir)
* LUCENE-2333: Fix failures during contrib builds, when classes in
core were changed without ant clean. This fix also optimizes the
diff --git a/lucene/contrib/surround/README.txt b/lucene/contrib/queryparser/README.txt
similarity index 100%
rename from lucene/contrib/surround/README.txt
rename to lucene/contrib/queryparser/README.txt
diff --git a/lucene/contrib/queryparser/build.xml b/lucene/contrib/queryparser/build.xml
index c4f6b5dc9a5..467bfa4bd9a 100644
--- a/lucene/contrib/queryparser/build.xml
+++ b/lucene/contrib/queryparser/build.xml
@@ -28,7 +28,7 @@
-
+
@@ -105,4 +105,10 @@ import org.apache.lucene.queryParser.core.messages.*;"
outputDir="${javacc.precedence.path}"
/>
+
+
+
+
diff --git a/lucene/contrib/surround/src/java/overview.html b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/package.html
similarity index 81%
rename from lucene/contrib/surround/src/java/overview.html
rename to lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/package.html
index e4fbefcd079..3ea34b52bba 100644
--- a/lucene/contrib/surround/src/java/overview.html
+++ b/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/package.html
@@ -1,3 +1,4 @@
+
-
-
- surround
-
-
-
- surround
-
-
\ No newline at end of file
+
+A QueryParser that supports the Span family of queries as well as pre and infix notation.
+
+