diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 7d8e3634e7f..a7bc7266c9d 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -242,6 +242,9 @@ Build
* LUCENE-7693: Replace "org.apache." logic in GetMavenDependenciesTask.
(Daniel Collins, Christine Poerschke)
+* LUCENE-7726: Fix HTML entity bugs in Javadocs to be able to build with
+ Java 9. (Uwe Schindler, Hossman)
+
Other
* LUCENE-7666: Fix typos in lucene-join package info javadoc.
diff --git a/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java b/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
index dc4a666af19..32b2d24b824 100644
--- a/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
+++ b/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
@@ -103,7 +103,7 @@ import org.apache.lucene.util.StringHelper;
* Prospective Search,
* Jim Gray's
- *
+ *
* A Call to Arms - Custom subscriptions, and Tim Bray's
* On Search, the Series.
diff --git a/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java b/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java
index 3bbbf1b7866..41479f2ff5d 100644
--- a/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java
+++ b/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java
@@ -38,7 +38,7 @@ import org.apache.lucene.search.*;
* demoting effect
*
* This code was originally made available here:
- * http://marc.theaimsgroup.com/?l=lucene-user&m=108058407130459&w=2
+ * http://marc.theaimsgroup.com/?l=lucene-user&m=108058407130459&w=2
* and is documented here: http://wiki.apache.org/lucene-java/CommunityContributions
*/
public class BoostingQuery extends Query {