diff --git a/WHATSNEW b/WHATSNEW
index 2022cb80a..c55446bce 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -77,6 +77,9 @@ Changes that could break older environments:
   affect programs/scripts that called the launcher and which did not want to
   receive an error if Ant itself would not start
 
+* All .NET tasks are now deprecated in favor of the new .NET Antlib:
+  http://ant.apache.org/antlibs/proper.html
+
 Fixed bugs:
 -----------
 
diff --git a/docs/manual/OptionalTasks/dotnet.html b/docs/manual/OptionalTasks/dotnet.html
index 0962f7842..7b214b310 100644
--- a/docs/manual/OptionalTasks/dotnet.html
+++ b/docs/manual/OptionalTasks/dotnet.html
@@ -8,6 +8,11 @@
 <h2>Introduction</h2>
 
 
+<p><strong>These tasks are deprecated and will be removed in a future
+release of Ant.  They are now part of the <a
+href="http://ant.apache.org/antlibs/proper.html">.NET
+Antlib</a>.</strong></p>
+
 Ant support for .NET goes back to before .NET was released, and
 continues to be expanded based on user demand. Users writing nothing but
 a .NET application, may want to look at the .NET-based
diff --git a/docs/manual/optionaltasklist.html b/docs/manual/optionaltasklist.html
index fdfb70d9a..1cc583a5c 100644
--- a/docs/manual/optionaltasklist.html
+++ b/docs/manual/optionaltasklist.html
@@ -16,7 +16,7 @@
 <a href="conceptstypeslist.html" target="navFrame">Concepts and Types</a><br>
 
 <h3>Optional Tasks</h3>
-<a href="OptionalTasks/dotnet.html">.NET Tasks</a><br>
+<a href="OptionalTasks/dotnet.html"><i>.NET Tasks</i></a><br>
 <a href="OptionalTasks/antlr.html">ANTLR</a><br>
 <a href="OptionalTasks/attrib.html">Attrib</a><br>
 <a href="OptionalTasks/cab.html">Cab</a><br>
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java
index 7257ad1a6..9da6a1e75 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java
@@ -809,6 +809,10 @@ public abstract class DotnetCompile
      */
     public void execute()
              throws BuildException {
+        log("This task is deprecated and will be removed in a future version\n"
+            + "of Ant.  It is now part of the .NET Antlib:\n"
+            + "http://ant.apache.org/antlibs/proper.html", Project.MSG_ERR);
+
         validate();
         NetCommand command = createNetCommand();
         //set up response file options
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java
index a9adaf59e..8eae19bf9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java
@@ -456,6 +456,9 @@ public class Ilasm
      */
     public void execute()
              throws BuildException {
+        log("This task is deprecated and will be removed in a future version\n"
+            + "of Ant.  It is now part of the .NET Antlib:\n"
+            + "http://ant.apache.org/antlibs/proper.html", Project.MSG_ERR);
         NetCommand command = buildIlasmCommand();
 
         addFilesAndExecute(command, false);
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java
index 0aad2abbb..ef0a37d3b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java
@@ -345,6 +345,9 @@ public class Ildasm extends Task {
      * @throws BuildException
      */
     public void execute() throws BuildException {
+        log("This task is deprecated and will be removed in a future version\n"
+            + "of Ant.  It is now part of the .NET Antlib:\n"
+            + "http://ant.apache.org/antlibs/proper.html", Project.MSG_ERR);
         validate();
         if (!isDisassemblyNeeded()) {
             return;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java
index e31cb55bd..d1468174d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java
@@ -184,6 +184,9 @@ public class ImportTypelib extends Task {
      * @exception BuildException if something goes wrong with the build
      */
     public void execute() throws BuildException {
+        if ("WsdlToDotnet".equals(getTaskType())) {
+            log("Warning: the task name <WsdlToDotnet> is deprecated. Use <wsdltodotnet> (all lowercase) instead.", Project.MSG_WARN);
+        }
         validate();
         log("Importing typelib " + srcFile
             + " to assembly " + destFile
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java
index eae29e9ff..e59bd42af 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.java
@@ -276,9 +276,9 @@ public class WsdlToDotnet extends Task  {
      */
     public void execute()
              throws BuildException {
-        if ("WsdlToDotnet".equals(getTaskType())) {
-            log("Warning: the task name <WsdlToDotnet> is deprecated. Use <wsdltodotnet> (all lowercase) instead.", Project.MSG_WARN);
-        }
+        log("This task is deprecated and will be removed in a future version\n"
+            + "of Ant.  It is now part of the .NET Antlib:\n"
+            + "http://ant.apache.org/antlibs/proper.html", Project.MSG_ERR);
 
         if (compiler == null) {
             compiler = Compiler.createDefaultCompiler();