diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 577e16ca24f..bd6160323c7 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -143,6 +143,9 @@ Build
* LUCENE-5383: fix changes2html to link pull requests (Steve Rowe)
+* LUCENE-5411: Upgrade to released JFlex 1.5.0; stop requiring
+ a locally built JFlex snapshot jar. (Steve Rowe)
+
Bug fixes
* LUCENE-5285: Improved highlighting of multi-valued fields with
diff --git a/lucene/analysis/common/build.xml b/lucene/analysis/common/build.xml
index a4ed2c480a9..b4bdd7fde76 100644
--- a/lucene/analysis/common/build.xml
+++ b/lucene/analysis/common/build.xml
@@ -29,7 +29,7 @@
-
@@ -40,11 +40,7 @@
-
-
-
+ depends="init,generate-jflex-html-char-entities">
@@ -65,25 +61,16 @@
-
-
-
-
+
-
-
-
-
+
-
-
-
-
+
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 7d5c933a608..d64139a2066 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -227,17 +227,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -472,31 +461,6 @@
-
-
-
-
-
- ##################################################################
- JFlex not found.
- JFlex Home: ${jflex.home}
-
- Please install the jFlex 1.5 version (currently not released)
- from its SVN repository:
-
- svn co -r 722 https://svn.code.sf.net/p/jflex/code/trunk jflex
- cd jflex
- mvn install
-
- Then, create a build.properties file either in your home
- directory, or within the Lucene directory and set the jflex.home
- property to the path where the JFlex trunk checkout is located
- (in the above example it's the directory called "jflex").
-
- ##################################################################
-
-
-
-
+
+
+
+
+
+
+
+