diff --git a/build.gradle b/build.gradle
index ba993d4a21..3b2636785a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -73,6 +73,10 @@ sourceSets {
   }
 }
 
+javadoc {
+  title = "Avian v${version} Class Library API"
+}
+
 task javadocJar(type: Jar) {
   dependsOn javadoc
   classifier = 'javadoc'
diff --git a/makefile b/makefile
index 94da98a00f..1059808721 100755
--- a/makefile
+++ b/makefile
@@ -1528,14 +1528,6 @@ tarball:
 	(cd .. && tar --exclude=build --exclude='.*' --exclude='*~' -cjf \
 		avian/build/avian-$(version).tar.bz2 avian)
 
-.PHONY: javadoc
-javadoc:
-	$(JAVA_HOME)/bin/javadoc -sourcepath classpath -d build/javadoc -subpackages avian:java \
-		-windowtitle "Avian v$(version) Class Library API" \
-		-doctitle "Avian v$(version) Class Library API" \
-		-header "Avian v$(version)" \
-		-bottom "<a href=\"http://oss.readytalk.com/avian/\">http://oss.readytalk.com/avian</a>"
-
 .PHONY: clean-current
 clean-current:
 	@echo "removing $(build)"