diff --git a/src/main/org/apache/tools/ant/taskdefs/defaults.properties b/src/main/org/apache/tools/ant/taskdefs/defaults.properties
index b9aa64326..5831273d5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/defaults.properties
+++ b/src/main/org/apache/tools/ant/taskdefs/defaults.properties
@@ -19,6 +19,7 @@ antcall=org.apache.tools.ant.taskdefs.CallTarget
 antstructure=org.apache.tools.ant.taskdefs.AntStructure
 antversion=org.apache.tools.ant.taskdefs.condition.AntVersion
 apply=org.apache.tools.ant.taskdefs.Transform
+apt=org.apache.tools.ant.taskdefs.Apt
 available=org.apache.tools.ant.taskdefs.Available
 basename=org.apache.tools.ant.taskdefs.Basename
 buildnumber=org.apache.tools.ant.taskdefs.BuildNumber
@@ -43,10 +44,13 @@ diagnostics=org.apache.tools.ant.taskdefs.DiagnosticsTask
 dirname=org.apache.tools.ant.taskdefs.Dirname
 ear=org.apache.tools.ant.taskdefs.Ear
 echo=org.apache.tools.ant.taskdefs.Echo
+echoproperties=org.apache.tools.ant.taskdefs.optional.EchoProperties
+echoxml=org.apache.tools.ant.taskdefs.EchoXML
 exec=org.apache.tools.ant.taskdefs.ExecTask
 fail=org.apache.tools.ant.taskdefs.Exit
 filter=org.apache.tools.ant.taskdefs.Filter
 fixcrlf=org.apache.tools.ant.taskdefs.FixCRLF
+funtest=org.apache.tools.ant.taskdefs.optional.testing.Funtest
 genkey=org.apache.tools.ant.taskdefs.GenerateKey
 get=org.apache.tools.ant.taskdefs.Get
 gunzip=org.apache.tools.ant.taskdefs.GUnzip
@@ -64,6 +68,7 @@ loadresource=org.apache.tools.ant.taskdefs.LoadResource
 local=org.apache.tools.ant.taskdefs.Local
 macrodef=org.apache.tools.ant.taskdefs.MacroDef
 mail=org.apache.tools.ant.taskdefs.email.EmailTask
+makeurl=org.apache.tools.ant.taskdefs.MakeUrl
 manifest=org.apache.tools.ant.taskdefs.ManifestTask
 manifestclasspath=org.apache.tools.ant.taskdefs.ManifestClassPath
 mkdir=org.apache.tools.ant.taskdefs.Mkdir
@@ -77,6 +82,7 @@ property=org.apache.tools.ant.taskdefs.Property
 propertyhelper=org.apache.tools.ant.taskdefs.PropertyHelperTask
 record=org.apache.tools.ant.taskdefs.Recorder
 replace=org.apache.tools.ant.taskdefs.Replace
+resourcecount=org.apache.tools.ant.taskdefs.ResourceCount
 retry=org.apache.tools.ant.taskdefs.Retry
 rmic=org.apache.tools.ant.taskdefs.Rmic
 sequential=org.apache.tools.ant.taskdefs.Sequential
@@ -106,7 +112,6 @@ zip=org.apache.tools.ant.taskdefs.Zip
 
 # optional tasks
 antlr=org.apache.tools.ant.taskdefs.optional.ANTLR
-apt=org.apache.tools.ant.taskdefs.Apt
 attrib=org.apache.tools.ant.taskdefs.optional.windows.Attrib
 blgenclient=org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient
 cab=org.apache.tools.ant.taskdefs.optional.Cab
@@ -132,12 +137,9 @@ chgrp=org.apache.tools.ant.taskdefs.optional.unix.Chgrp
 chown=org.apache.tools.ant.taskdefs.optional.unix.Chown
 ddcreator=org.apache.tools.ant.taskdefs.optional.ejb.DDCreator
 depend=org.apache.tools.ant.taskdefs.optional.depend.Depend
-echoproperties=org.apache.tools.ant.taskdefs.optional.EchoProperties
-echoxml=org.apache.tools.ant.taskdefs.EchoXML
 ejbc=org.apache.tools.ant.taskdefs.optional.ejb.Ejbc
 ejbjar=org.apache.tools.ant.taskdefs.optional.ejb.EjbJar
 ftp=org.apache.tools.ant.taskdefs.optional.net.FTP
-funtest=org.apache.tools.ant.taskdefs.optional.testing.Funtest
 image=org.apache.tools.ant.taskdefs.optional.image.Image
 iplanet-ejbc=org.apache.tools.ant.taskdefs.optional.ejb.IPlanetEjbcTask
 jarlib-available=org.apache.tools.ant.taskdefs.optional.extension.JarLibAvailableTask
@@ -151,7 +153,6 @@ jjdoc=org.apache.tools.ant.taskdefs.optional.javacc.JJDoc
 jjtree=org.apache.tools.ant.taskdefs.optional.javacc.JJTree
 junit=org.apache.tools.ant.taskdefs.optional.junit.JUnitTask
 junitreport=org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator
-makeurl=org.apache.tools.ant.taskdefs.MakeUrl
 native2ascii=org.apache.tools.ant.taskdefs.optional.Native2Ascii
 netrexxc=org.apache.tools.ant.taskdefs.optional.NetRexxC
 p4add=org.apache.tools.ant.taskdefs.optional.perforce.P4Add
@@ -172,7 +173,6 @@ p4sync=org.apache.tools.ant.taskdefs.optional.perforce.P4Sync
 propertyfile=org.apache.tools.ant.taskdefs.optional.PropertyFile
 pvcs=org.apache.tools.ant.taskdefs.optional.pvcs.Pvcs
 replaceregexp=org.apache.tools.ant.taskdefs.optional.ReplaceRegExp
-resourcecount=org.apache.tools.ant.taskdefs.ResourceCount
 rexec=org.apache.tools.ant.taskdefs.optional.net.RExecTask
 rpm=org.apache.tools.ant.taskdefs.optional.Rpm
 schemavalidate=org.apache.tools.ant.taskdefs.optional.SchemaValidate