diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index a6a14441540..f5cd325b455 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -1,22 +1,21 @@
-apply plugin: 'java'
+apply plugin: "java-gradle-plugin"
 
 repositories {
 	mavenCentral()
 }
 
-dependencies {
-	compile gradleApi()
-}
-
-// GAE
-dependencies {
-	compile 'com.google.appengine:appengine-tools-sdk:1.4.2'
+gradlePlugin {
+	plugins {
+		trang {
+			id = "trang"
+			implementationClass = "trang.TrangPlugin"
+		}
+	}
 }
 
-// Trang
 dependencies {
-	compile 'com.thaiopensource:trang:20091111',
-			'net.sourceforge.saxon:saxon:9.1.0.8'
+	compile 'com.thaiopensource:trang:20091111'
+	compile 'net.sourceforge.saxon:saxon:9.1.0.8'
 }
 
 task ide(type: Copy)  {
diff --git a/buildSrc/src/main/java/trang/TrangPlugin.java b/buildSrc/src/main/java/trang/TrangPlugin.java
index 39feb412edf..d447b64bb42 100644
--- a/buildSrc/src/main/java/trang/TrangPlugin.java
+++ b/buildSrc/src/main/java/trang/TrangPlugin.java
@@ -2,7 +2,6 @@
 
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
-import org.gradle.api.Task;
 
 /**
  * Used for converting .rnc files to .xsd files.
@@ -11,8 +10,9 @@
 public class TrangPlugin implements Plugin<Project> {
 	@Override
 	public void apply(Project project) {
-		Task rncToXsd = project.getTasks().create("rncToXsd", RncToXsd.class);
-		rncToXsd.setDescription("Converts .rnc to .xsd");
-		rncToXsd.setGroup("Build");
+		project.getTasks().register("rncToXsd", RncToXsd.class, rncToXsd -> {
+			rncToXsd.setDescription("Converts .rnc to .xsd");
+			rncToXsd.setGroup("Build");
+		});
 	}
 }
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/trang.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/trang.properties
deleted file mode 100644
index 4ef5e2b39e4..00000000000
--- a/buildSrc/src/main/resources/META-INF/gradle-plugins/trang.properties
+++ /dev/null
@@ -1 +0,0 @@
-implementation-class=trang.TrangPlugin
\ No newline at end of file