diff --git a/cache/pom.xml b/cache/pom.xml
index 48c5d61313..dcd1892fc5 100644
--- a/cache/pom.xml
+++ b/cache/pom.xml
@@ -155,6 +155,20 @@
 					</execution>
 				</executions>
 			</plugin>
+			<!-- Delombok after generating ANTLR sources, if they are not available
+			delombok fails due to the missing classes -->
+			<plugin>
+				<groupId>org.projectlombok</groupId>
+				<artifactId>lombok-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<!-- Include generated ANTLR sources in javadoc generation -->
+					<sourcepath>${project.build.directory}/delombok;${project.build.directory}/generated-sources/antlr4</sourcepath>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 11465f772f..32a884b1b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,6 +200,30 @@
 				<artifactId>maven-release-plugin</artifactId>
 				<version>2.5.3</version>
 			</plugin>
+			<plugin>
+				<groupId>org.projectlombok</groupId>
+				<artifactId>lombok-maven-plugin</artifactId>
+				<version>1.18.16.0</version>
+				<configuration>
+					<!-- Delomboked sources are only used for javadoc generation, and can be
+					skipped when javadoc is not being run. -->
+					<skip>${maven.javadoc.skip}</skip>
+					<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
+					<!-- The default output directory is in generated-sources, which is
+					treated as a source root, even with addOutputDirectory false. So,
+					place it in top level build directory instead. -->
+					<outputDirectory>${project.build.directory}/delombok</outputDirectory>
+					<addOutputDirectory>false</addOutputDirectory>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>delombok</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
@@ -209,6 +233,8 @@
 					<source>8</source>
 					<!-- Fix Javadoc search feature to work without modules - https://stackoverflow.com/a/52603413 -->
 					<additionalJOption>--no-module-directories</additionalJOption>
+					<!-- Javadoc the delombok sources -->
+					<sourcepath>${project.build.directory}/delombok</sourcepath>
 				</configuration>
 				<!-- maven-release-plugin runs maven-javadoc-plugin:jar as one of its
 				     release steps, so we will run it as well for the CI. Note this
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java
index 151c5eae97..41944b5cd7 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/Overlay.java
@@ -57,7 +57,7 @@ public abstract class Overlay implements LayoutableRenderableEntity
 	private boolean resettable = true;
 
 	/**
-	 * Whether this overlay can be dragged onto other overlays & have
+	 * Whether this overlay can be dragged onto other overlays &amp; have
 	 * other overlays dragged onto it.
 	 */
 	@Setter(AccessLevel.PROTECTED)
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayPanel.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayPanel.java
index 6d749b765f..41afe1149c 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayPanel.java
@@ -41,7 +41,7 @@ public abstract class OverlayPanel extends Overlay
 	protected final PanelComponent panelComponent = new PanelComponent();
 
 	/**
-	 * Enables/disables automatic clearing of {@link this#getPanelComponent()} children after rendering (enabled by default)
+	 * Enables/disables automatic clearing of {@link OverlayPanel#getPanelComponent()} children after rendering (enabled by default)
 	 */
 	private boolean clearChildren = true;