diff --git a/buildScripts/compile.ant.xml b/buildScripts/compile.ant.xml
index cce756f7a..bfe061794 100644
--- a/buildScripts/compile.ant.xml
+++ b/buildScripts/compile.ant.xml
@@ -199,6 +199,16 @@ 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/maven-plugin" />
+			<classpath refid="cp.build" />
+			<classpath refid="cp.maven-plugin" />
+			<classpath path="build/lombok-utils:build/lombok-utils6:build/lombok-main:dist/spiProcessor.jar" />
+			<annotationProcessor jar="dist/spiProcessor.jar" processor="lombok.spi.SpiProcessor" />
+		</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" />
@@ -235,6 +245,20 @@ lombok.launch.AnnotationProcessorHider$ClaimingProcessor</echo>
 		<mkdir dir="build/lombok-main/META-INF/gradle" />
 		<echo file="build/lombok-main/META-INF/gradle/incremental.annotation.processors">lombok.launch.AnnotationProcessorHider$AnnotationProcessor,isolating
 lombok.launch.AnnotationProcessorHider$ClaimingProcessor,isolating</echo>
+		<mkdir dir="build/lombok-main/META-INF/plexus" />
+		<echo file="build/lombok-main/META-INF/plexus/components.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<component-set>
+	<components>
+		<component>
+			<role>org.codehaus.plexus.compiler.Compiler</role>
+			<role-hint>lombok</role-hint>
+			<implementation>lombok.mavenplugin.LombokedJavacCompiler</implementation>
+			<description />
+			<isolated-realm>false</isolated-realm>
+		</component>
+	</components>
+</component-set>
+]]></echo>
 	</target>
 	
 	<!-- compiles the bit of API from mapstruct that lombok compiles against. -->
@@ -275,6 +299,7 @@ lombok.launch.AnnotationProcessorHider$ClaimingProcessor,isolating</echo>
 				<include name="lombok/extern/**" />
 				<include name="lombok/launch/**" />
 				<include name="lombok/delombok/ant/Tasks*" />
+				<include name="lombok/mavenplugin/*" />
 				<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 e475bc8e5..0a0c759aa 100644
--- a/buildScripts/create-eclipse-project.ant.xml
+++ b/buildScripts/create-eclipse-project.ant.xml
@@ -34,6 +34,7 @@ This buildfile is part of projectlombok.org. It creates the infrastructure neede
 			<srcdir dir="src/launch" />
 			<srcdir dir="src/utils" />
 			<srcdir dir="src/ant-plugin" />
+			<srcdir dir="src/maven-plugin" />
 			<srcdir dir="src/eclipseAgent" />
 			<srcdir dir="src/mavenEcjBootstrapAgent" />
 			<srcdir dir="src/installer" />
@@ -52,6 +53,7 @@ This buildfile is part of projectlombok.org. It creates the infrastructure neede
 			<conf name="test" sources="sources" />
 			<conf name="buildtools" sources="sources" />
 			<conf name="ant-plugin" sources="sources" />
+			<conf name="maven-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 1f6fb3784..b4a8918c2 100644
--- a/buildScripts/ivy.xml
+++ b/buildScripts/ivy.xml
@@ -17,6 +17,7 @@
 		<conf name="sources" />
 		
 		<conf name="ant-plugin" />
+		<conf name="maven-plugin" />
 		
 		<!-- and now for custom configs for testing lombok against -->
 		
@@ -42,6 +43,8 @@
 		<dependency org="zwitserloot.com" name="cmdreader" rev="1.2" conf="build,stripe->runtime" />
 		<dependency org="org.apache.ant" name="ant" rev="1.10.5" conf="ant-plugin->default" />
 		<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" />
 
 		<!-- 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 092c2ab28..f203a9112 100644
--- a/buildScripts/setup.ant.xml
+++ b/buildScripts/setup.ant.xml
@@ -314,13 +314,14 @@ 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,eclipse-oxygen,mapstruct,sources,stripe,buildtools,test" />
+		<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:retrieve symlink="true" />
 		<ivy:cachepath pathid="cp.javac6" conf="javac6" />
 		<ivy:cachepath pathid="cp.javac8" conf="javac8" />
 		<ivy:cachepath pathid="cp.ecj8" conf="ecj8" />
 		<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.eclipse-oxygen" conf="eclipse-oxygen" />
 		<ivy:cachepath pathid="cp.mapstruct" conf="mapstruct" />
 		<ivy:cachepath pathid="cp.stripe" conf="stripe" />
diff --git a/src/maven-plugin/lombok/mavenplugin/LombokedJavacCompiler.java b/src/maven-plugin/lombok/mavenplugin/LombokedJavacCompiler.java
new file mode 100644
index 000000000..15f16d8db
--- /dev/null
+++ b/src/maven-plugin/lombok/mavenplugin/LombokedJavacCompiler.java
@@ -0,0 +1,27 @@
+package lombok.mavenplugin;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.codehaus.plexus.compiler.CompilerConfiguration;
+import org.codehaus.plexus.compiler.CompilerException;
+import org.codehaus.plexus.compiler.CompilerResult;
+import org.codehaus.plexus.compiler.javac.JavacCompiler;
+
+public class LombokedJavacCompiler extends JavacCompiler {
+	@Override public String getCompilerId() {
+		return "lombok";
+	}
+	
+	private static final String[] LOMBOK_ADD_OPENS_C_S_T_J = {"code", "comp", "file", "main", "model", "parser", "processing", "tree", "util"};
+	
+	@Override public CompilerResult performCompile(CompilerConfiguration conf) throws CompilerException {
+		conf.setFork(true);
+		Map<String, String> out = new HashMap<String, String>();
+		Map<String, String> map = conf.getCustomCompilerArgumentsAsMap();
+		if (map != null) out.putAll(map);
+		for (String n : LOMBOK_ADD_OPENS_C_S_T_J) out.put("-J--add-opens=jdk.compiler/com.sun.tools.javac." + n + "=ALL-UNNAMED", null);
+		conf.setCustomCompilerArgumentsAsMap(out);
+		return super.performCompile(conf);
+	}
+}