diff --git a/buildScripts/compile.ant.xml b/buildScripts/compile.ant.xml
index bfe0617940..fff9c5b8a9 100644
--- a/buildScripts/compile.ant.xml
+++ b/buildScripts/compile.ant.xml
@@ -181,6 +181,7 @@ This buildfile is part of projectlombok.org. It takes care of compiling and buil
 			<src path="src/core" />
 			<src path="src/installer" />
 			<src path="src/eclipseAgent" />
+			<src path="src/delombok" />
 			<exclude name="**/*Transplants.java" />
 			<classpath refid="cp.build" />
 			<classpath refid="cp.eclipse-oxygen" />
@@ -209,6 +210,13 @@ This buildfile is part of projectlombok.org. It takes care of compiling and buil
 			<annotationProcessor jar="dist/spiProcessor.jar" processor="lombok.spi.SpiProcessor" />
 		</ivy:compile>
 		
+		<ivy:compile destdir="build/lombok-main" source="1.6" target="1.6" ecj="true" nowarn="true">
+			<bootclasspath location="build/stubs" />
+			<bootclasspath path="${jdk6-rt.loc}" />
+			<src path="src/gradle-plugin" />
+			<classpath refid="cp.gradle-plugin" />
+		</ivy:compile>
+		
 		<!-- This is really part of the eclipse agent, but references lombok, so that had to be compiled first -->
 		<ivy:compile destdir="build/lombok-main/Class50" source="1.5" target="1.6" ecj="true">
 			<bootclasspath location="build/stubs" />
@@ -259,6 +267,8 @@ lombok.launch.AnnotationProcessorHider$ClaimingProcessor,isolating</echo>
 	</components>
 </component-set>
 ]]></echo>
+		<mkdir dir="build/lombok-main/META-INF/gradle-plugins" />
+		<echo file="build/lombok-main/META-INF/gradle-plugins/org.projectlombok.lombok.properties">implementation-class=lombok.gradleplugin.LombokPlugin</echo>
 	</target>
 	
 	<!-- compiles the bit of API from mapstruct that lombok compiles against. -->
@@ -300,6 +310,7 @@ lombok.launch.AnnotationProcessorHider$ClaimingProcessor,isolating</echo>
 				<include name="lombok/launch/**" />
 				<include name="lombok/delombok/ant/Tasks*" />
 				<include name="lombok/mavenplugin/*" />
+				<include name="lombok/gradleplugin/*" />
 				<include name="lombok/javac/apt/Processor.class" />
 				<include name="lombok/META-INF/**" />
 			</patternset>
diff --git a/buildScripts/create-eclipse-project.ant.xml b/buildScripts/create-eclipse-project.ant.xml
index 0a0c759aa8..20ce0c2485 100644
--- a/buildScripts/create-eclipse-project.ant.xml
+++ b/buildScripts/create-eclipse-project.ant.xml
@@ -35,6 +35,7 @@ This buildfile is part of projectlombok.org. It creates the infrastructure neede
 			<srcdir dir="src/utils" />
 			<srcdir dir="src/ant-plugin" />
 			<srcdir dir="src/maven-plugin" />
+			<srcdir dir="src/gradle-plugin" />
 			<srcdir dir="src/eclipseAgent" />
 			<srcdir dir="src/mavenEcjBootstrapAgent" />
 			<srcdir dir="src/installer" />
@@ -54,6 +55,7 @@ This buildfile is part of projectlombok.org. It creates the infrastructure neede
 			<conf name="buildtools" sources="sources" />
 			<conf name="ant-plugin" sources="sources" />
 			<conf name="maven-plugin" sources="sources" />
+			<conf name="gradle-plugin" sources="sources" />
 			<local org="org.projectlombok" name="lombok.patcher" dir="../lombok.patcher" />
 			<settings>
 				<url url="https://projectlombok.org/downloads/lombok.eclipse.settings" />
diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
index b4a8918c2b..5d3e01df48 100644
--- a/buildScripts/ivy.xml
+++ b/buildScripts/ivy.xml
@@ -18,6 +18,7 @@
 		
 		<conf name="ant-plugin" />
 		<conf name="maven-plugin" />
+		<conf name="gradle-plugin" />
 		
 		<!-- and now for custom configs for testing lombok against -->
 		
@@ -45,6 +46,7 @@
 		<dependency org="org.apache.ant" name="ant-junit" rev="1.10.5" conf="ant-plugin->default" />
 		<dependency org="org.codehaus.plexus" name="plexus-compiler-javac" rev="2.13.0" conf="maven-plugin->default" />
 		<dependency org="org.codehaus.plexus" name="plexus-container-default" rev="2.1.1" conf="maven-plugin->default" />
+		<dependency org="dev.gradleplugins" name="gradle-api" rev="8.3" conf="gradle-plugin->default" />
 
 		<!-- test deps -->
 		<dependency org="junit" name="junit" rev="4.13.2" conf="test->default; sources" />
diff --git a/buildScripts/setup.ant.xml b/buildScripts/setup.ant.xml
index f203a91123..d30ff95bf5 100644
--- a/buildScripts/setup.ant.xml
+++ b/buildScripts/setup.ant.xml
@@ -314,7 +314,7 @@ This buildfile is part of projectlombok.org. It sets up the build itself.
 	</macrodef>
 	
 	<target name="deps" depends="ivy.config, deps.jdk-runtime" description="Downloads all dependencies needed for common tasks">
-		<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="javac6,javac8,ecj8,build,ant-plugin,maven-plugin,eclipse-oxygen,mapstruct,sources,stripe,buildtools,test" />
+		<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="javac6,javac8,ecj8,build,ant-plugin,maven-plugin,gradle-plugin,eclipse-oxygen,mapstruct,sources,stripe,buildtools,test" />
 		<ivy:retrieve symlink="true" />
 		<ivy:cachepath pathid="cp.javac6" conf="javac6" />
 		<ivy:cachepath pathid="cp.javac8" conf="javac8" />
@@ -322,6 +322,7 @@ This buildfile is part of projectlombok.org. It sets up the build itself.
 		<ivy:cachepath pathid="cp.build" conf="build" />
 		<ivy:cachepath pathid="cp.ant-plugin" conf="ant-plugin" />
 		<ivy:cachepath pathid="cp.maven-plugin" conf="maven-plugin" />
+		<ivy:cachepath pathid="cp.gradle-plugin" conf="gradle-plugin" />
 		<ivy:cachepath pathid="cp.eclipse-oxygen" conf="eclipse-oxygen" />
 		<ivy:cachepath pathid="cp.mapstruct" conf="mapstruct" />
 		<ivy:cachepath pathid="cp.stripe" conf="stripe" />
diff --git a/src/gradle-plugin/lombok/gradleplugin/LombokPlugin.java b/src/gradle-plugin/lombok/gradleplugin/LombokPlugin.java
new file mode 100644
index 0000000000..c7a0df7c7f
--- /dev/null
+++ b/src/gradle-plugin/lombok/gradleplugin/LombokPlugin.java
@@ -0,0 +1,37 @@
+package lombok.gradleplugin;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.gradle.api.Action;
+import org.gradle.api.Plugin;
+import org.gradle.api.Project;
+import org.gradle.api.Task;
+import org.gradle.api.tasks.compile.JavaCompile;
+
+public class LombokPlugin implements Plugin<Project> {
+	private static final List<String> OPENS = Arrays.asList(
+		"--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
+		"--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
+		"--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+		"--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
+		"--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
+		"--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
+		"--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
+		"--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+		"--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
+	);
+
+	public void apply(Project target) {
+		target.getTasks().withType(JavaCompile.class).configureEach(new Action<JavaCompile>() {
+			public void execute(final JavaCompile compileJava) {
+				compileJava.doFirst("Opens modules for lombok", new Action<Task>() {
+					public void execute(Task t) {
+						compileJava.getOptions().setFork(true);
+						compileJava.getOptions().getForkOptions().getJvmArgs().addAll(OPENS);
+					}
+				});
+			}
+		});
+	}
+}
\ No newline at end of file