diff --git a/src/main/org/apache/tools/ant/types/defaults.properties b/src/main/org/apache/tools/ant/types/defaults.properties
index a876a143f..2e6527996 100644
--- a/src/main/org/apache/tools/ant/types/defaults.properties
+++ b/src/main/org/apache/tools/ant/types/defaults.properties
@@ -31,15 +31,28 @@ compositemapper=org.apache.tools.ant.util.CompositeMapper
 chainedmapper=org.apache.tools.ant.util.ChainedMapper
 filtermapper=org.apache.tools.ant.types.mappers.FilterMapper
 
-#conditions:
-issigned=org.apache.tools.ant.taskdefs.condition.IsSigned
+#all conditions, in alphabetical order
+and=org.apache.tools.ant.taskdefs.condition.And
+contains=org.apache.tools.ant.taskdefs.condition.Contains
+equals=org.apache.tools.ant.taskdefs.condition.Equals
+filesmatch=org.apache.tools.ant.taskdefs.condition.Filesmatch
+http=org.apache.tools.ant.taskdefs.condition.Http
+isfailure=org.apache.tools.ant.taskdefs.condition.IsFailure
+isfalse=org.apache.tools.ant.taskdefs.condition.IsFalse
 isfileselected=org.apache.tools.ant.taskdefs.condition.IsFileSelected
 isreachable=org.apache.tools.ant.taskdefs.condition.IsReachable
-scriptcondition=org.apache.tools.ant.types.optional.ScriptCondition
-xor=org.apache.tools.ant.taskdefs.condition.Xor
+isreference=org.apache.tools.ant.taskdefs.condition.IsReference
+isset=org.apache.tools.ant.taskdefs.condition.IsSet
+issigned=org.apache.tools.ant.taskdefs.condition.IsSigned
+istrue=org.apache.tools.ant.taskdefs.condition.IsTrue
+not=org.apache.tools.ant.taskdefs.condition.Not
+or=org.apache.tools.ant.taskdefs.condition.Or
+os=org.apache.tools.ant.taskdefs.condition.Os
 parsersupports=org.apache.tools.ant.taskdefs.condition.ParserSupports
-isfailure=org.apache.tools.ant.taskdefs.condition.IsFailure
 resourcesmatch=org.apache.tools.ant.taskdefs.condition.ResourcesMatch
+scriptcondition=org.apache.tools.ant.types.optional.ScriptCondition
+socket=org.apache.tools.ant.taskdefs.condition.Socket
+xor=org.apache.tools.ant.taskdefs.condition.Xor
 
 #ResourceCollections:
 dirset=org.apache.tools.ant.types.DirSet