diff --git a/build.gradle b/build.gradle
index d609eb5f..452375fb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -156,7 +156,7 @@ installDist {
   dependsOn build
 }
 
-task processSource(type: Sync) {
+tasks.register('processSource', Sync) {
   def gitOutput = new ByteArrayOutputStream()
 
   exec {
@@ -175,7 +175,7 @@ task processSource(type: Sync) {
   } into "${project.buildDir}/src"
 }
 
-task update {
+tasks.register('update') {
   dependsOn installDist
 
   def rsyncArgs = ['--archive', '--filter', '- backups']
@@ -221,7 +221,7 @@ task update {
   }
 }
 
-task jsdoc(type: Exec) {
+tasks.register('jsdoc', Exec) {
   description 'Generates JSDoc API documentation for the included JavaScript modules.'
   group 'Documentation'
 
@@ -235,7 +235,7 @@ task jsdoc(type: Exec) {
   args = ['jsdoc', '-d', "$destination"].plus(sources)
 }
 
-task xgettext(type: JavaExec) {
+tasks.register('xgettext', JavaExec) {
   description 'Extracts translatable message strings from source code.'
   group 'i18n'
 
@@ -252,7 +252,7 @@ task xgettext(type: JavaExec) {
   ]
 }
 
-task po2js(type: JavaExec) {
+tasks.register('po2js', JavaExec) {
   description 'Converts translated message strings from PO format to JavaScript.'
   group 'i18n'
 
@@ -267,7 +267,7 @@ task po2js(type: JavaExec) {
   ]
 }
 
-task rhinoShell(type: JavaExec) {
+tasks.register('rhinoShell', JavaExec) {
   description 'Runs the interactive Rhino JavaScript shell.'
   group 'Application'
 
@@ -279,7 +279,7 @@ task rhinoShell(type: JavaExec) {
 
 // Call this task with a function definition using the `-P` parameter, e.g.
 // `./gradlew commandLine -Pfunction=manage.getAllApplications`
-task commandLine(type: JavaExec) {
+tasks.register('commandLine', JavaExec) {
   description 'Runs a function in a Helma application with `-Pfunction=app.functionName`.'
   group 'Application'
 
diff --git a/modules/helma/build.gradle b/modules/helma/build.gradle
index f78f66d4..401dd406 100644
--- a/modules/helma/build.gradle
+++ b/modules/helma/build.gradle
@@ -12,7 +12,7 @@ processResources.enabled = false
 processTestResources.enabled = false
 test.enabled = false
 
-task deps(type: Copy) {
+tasks.register('deps', Copy) {
 	from sourceSets.main.runtimeClasspath
 	into '.'
 }
diff --git a/modules/jala/build.gradle b/modules/jala/build.gradle
index e1ef800f..3b9b6684 100644
--- a/modules/jala/build.gradle
+++ b/modules/jala/build.gradle
@@ -15,7 +15,7 @@ processResources.enabled = false
 processTestResources.enabled = false
 test.enabled = false
 
-task deps(type: Copy) {
+tasks.register('deps', Copy) {
 	from sourceSets.main.runtimeClasspath
 	into 'lib'
 }
diff --git a/modules/jala/util/HopKit/build.gradle b/modules/jala/util/HopKit/build.gradle
index f6b40342..f8c9778e 100644
--- a/modules/jala/util/HopKit/build.gradle
+++ b/modules/jala/util/HopKit/build.gradle
@@ -10,7 +10,7 @@ processResources.enabled = false
 processTestResources.enabled = false
 test.enabled = false
 
-task deps(type: Copy) {
+tasks.register('deps', Copy) {
 	from sourceSets.main.runtimeClasspath
 	into 'lib'
 }
diff --git a/modules/jala/util/Test/build.gradle b/modules/jala/util/Test/build.gradle
index 91015efc..7e596efa 100644
--- a/modules/jala/util/Test/build.gradle
+++ b/modules/jala/util/Test/build.gradle
@@ -10,7 +10,7 @@ processResources.enabled = false
 processTestResources.enabled = false
 test.enabled = false
 
-task deps(type: Copy) {
+tasks.register('deps', Copy) {
 	from sourceSets.main.runtimeClasspath
 	into 'code'
 }