diff --git a/WHATSNEW b/WHATSNEW
index ec15d11df..a3480c618 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -14,6 +14,8 @@ Changes that could break older environments:
    make the task overwrite read-only destinations.
    Bugzilla Report 49261.
 
+ * Removed ant-nodeps.jar; it is now merged into ant.jar.
+
 Fixed bugs:
 -----------
 
diff --git a/build.xml b/build.xml
index c29053adb..c9e7f6bdc 100644
--- a/build.xml
+++ b/build.xml
@@ -44,7 +44,6 @@
   <property name="taskdefs.package" value="${ant.package}/taskdefs"/>
   <property name="condition.package" value="${taskdefs.package}/condition"/>
   <property name="optional.package" value="${taskdefs.package}/optional"/>
-  <property name="optional.condition.package" value="${optional.package}/condition"/>
   <property name="type.package" value="${ant.package}/types"/>
   <property name="optional.type.package" value="${type.package}/optional"/>
   <property name="apache.resolver.type.package" value="${ant.package}/types/resolver"/>
@@ -173,7 +172,7 @@
   <selector id="needs.jdk1.5+">
     <or>
       <filename name="${taskdefs.package}/AptTest*"/>
-      <filename name="${util.package}/java15/*"/>
+      <filename name="${util.package}/java15/"/>
       <filename name="${ant.package}/loader/*5*"/>
     </or>
   </selector>
@@ -187,11 +186,11 @@
   </selector>
 
   <selector id="needs.apache-resolver">
-    <filename name="${apache.resolver.type.package}/**"/>
+    <filename name="${apache.resolver.type.package}/"/>
   </selector>
 
   <selector id="needs.junit">
-    <filename name="${optional.package}/junit/**"/>
+    <filename name="${optional.package}/junit/"/>
   </selector>
 
   <selector id="needs.apache-regexp">
@@ -201,14 +200,14 @@
   <selector id="needs.apache-oro">
     <or>
       <filename name="${regexp.package}/JakartaOro*"/>
-      <filename name="${optional.package}/perforce/*"/>
+      <filename name="${optional.package}/perforce/"/>
     </or>
   </selector>
 
   <selector id="needs.apache-bcel">
     <or>
       <filename name="${ant.package}/filters/util/JavaClassHelper*"/>
-      <filename name="${util.package}/depend/bcel/*"/>
+      <filename name="${util.package}/depend/bcel/"/>
       <filename name="${optional.type.package}/depend/ClassFileSetTest*"/>
     </or>
   </selector>
@@ -251,26 +250,26 @@
   </selector>
 
   <selector id="needs.jmf">
-    <filename name="${optional.package}/sound/*"/>
+    <filename name="${optional.package}/sound/"/>
   </selector>
 
   <selector id="needs.jai">
     <or>
-      <filename name="${optional.package}/image/*"/>
-      <filename name="${optional.type.package}/image/*"/>
+      <filename name="${optional.package}/image/"/>
+      <filename name="${optional.type.package}/image/"/>
     </or>
   </selector>
 
   <selector id="needs.jdepend">
-    <filename name="${optional.package}/jdepend/*"/>
+    <filename name="${optional.package}/jdepend/"/>
   </selector>
 
   <selector id="needs.swing">
-    <filename name="${optional.package}/splash/*"/>
+    <filename name="${optional.package}/splash/"/>
   </selector>
 
   <selector id="needs.jsch">
-    <filename name="${optional.package}/ssh/*"/>
+    <filename name="${optional.package}/ssh/"/>
   </selector>
 
   <!-- needs TraceListenerEx3 interface implemented by PrintTraceListener -->
@@ -279,7 +278,7 @@
   </selector>
 
   <selector id="ant.launcher">
-    <filename name="${ant.package}/launch/**/*"/>
+    <filename name="${ant.package}/launch/"/>
   </selector>
 
   <patternset id="onlinetests">
@@ -640,32 +639,28 @@
       manifest="${manifest}"
       whenmanifestonly="fail">
       <not>
-        <selector id="non-core">
-          <or>
-            <and>
-              <filename name="${optional.package}/**"/>
-              <not><!-- #49287 -->
-                <or>
-                  <filename name="${optional.package}/TraXLiaison*"/>
-                  <filename name="${optional.package}/XSLTTraceSupport*"/>
-                </or>
-              </not>
-            </and>
-            <filename name="${optional.type.package}/**"/>
-            <filename name="${util.package}/depend/**"/>
-            <filename name="${util.package}/optional/**"/>
-            <selector refid="needs.apache-log4j"/>
-            <selector refid="needs.commons-logging"/>
-            <selector refid="needs.apache-bcel"/>
-            <selector refid="needs.apache-bsf"/>
-            <selector refid="needs.apache-regexp"/>
-            <selector refid="needs.apache-resolver"/>
-            <selector refid="needs.apache-oro"/>
-            <selector refid="needs.jdk1.5+"/>
-            <selector refid="needs.javamail"/>
-            <selector refid="ant.launcher"/>
-          </or>
-        </selector>
+        <or>
+          <!-- Verification: (cd dist/lib; for j in *.jar; do jar tf $j; done) | egrep -v '/$|META-INF/MANIFEST\.MF' | sort | uniq -d -->
+          <selector refid="needs.antlr"/>
+          <selector refid="needs.apache-bcel"/>
+          <selector refid="needs.apache-bsf"/>
+          <selector refid="needs.apache-log4j"/>
+          <selector refid="needs.apache-oro"/>
+          <selector refid="needs.apache-regexp"/>
+          <selector refid="needs.apache-resolver"/>
+          <selector refid="needs.apache-xalan2"/>
+          <selector refid="needs.commons-logging"/>
+          <selector refid="needs.commons-net"/>
+          <selector refid="needs.jai"/>
+          <selector refid="needs.javamail"/>
+          <selector refid="needs.jdepend"/>
+          <selector refid="needs.jmf"/>
+          <selector refid="needs.jsch"/>
+          <selector refid="needs.junit"/>
+          <selector refid="needs.netrexx"/>
+          <selector refid="needs.swing"/>
+          <selector refid="ant.launcher"/>
+        </or>
       </not>
       <metainf dir="${build.dir}">
         <include name="LICENSE.txt"/>
@@ -711,42 +706,6 @@
       </manifest>
     </jar>
 
-    <jar destfile="${build.lib}/ant-nodeps.jar"
-      basedir="${build.classes}"
-      manifest="${manifest.tmp}"
-      whenmanifestonly="${optional.jars.whenmanifestonly}">
-      <and>
-        <selector refid="non-core"/>
-        <not>
-          <or>
-            <selector refid="ant.launcher"/>
-            <selector refid="needs.apache-resolver"/>
-            <selector refid="needs.junit"/>
-            <selector refid="needs.apache-regexp"/>
-            <selector refid="needs.apache-oro"/>
-            <selector refid="needs.apache-bcel"/>
-            <selector refid="needs.apache-log4j"/>
-            <selector refid="needs.commons-logging"/>
-            <selector refid="needs.apache-bsf"/>
-            <selector refid="needs.javamail"/>
-            <selector refid="needs.netrexx"/>
-            <selector refid="needs.commons-net"/>
-            <selector refid="needs.antlr"/>
-            <selector refid="needs.jmf"/>
-            <selector refid="needs.jai"/>
-            <selector refid="needs.jdepend"/>
-            <selector refid="needs.swing"/>
-            <selector refid="needs.jsch"/>
-            <selector refid="needs.apache-xalan2"/>
-          </or>
-        </not>
-      </and>
-      <metainf dir="${build.dir}">
-        <include name="LICENSE.txt"/>
-        <include name="NOTICE.txt"/>
-      </metainf>
-    </jar>
-
     <macrodef name="optional-jar">
       <attribute name="dep"/>
       <sequential>
@@ -1026,7 +985,7 @@
 
     <copy todir="${src.dist.docs}">
       <fileset dir="${docs.dir}">
-        <exclude name="manual/api/**"/>
+        <exclude name="manual/api/"/>
         <patternset refid="site.excludes"/>
       </fileset>
     </copy>
@@ -1106,7 +1065,7 @@
         <include name="${dist.name}/bin/*.py"/>
       </zipfileset>
       <fileset dir="${dist.name}/..">
-        <include name="${dist.name}/**"/>
+        <include name="${dist.name}/"/>
         <exclude name="${dist.name}/bin/ant"/>
         <exclude name="${dist.name}/bin/antRun"/>
         <exclude name="${dist.name}/bin/*.pl"/>
@@ -1126,7 +1085,7 @@
         <include name="${dist.name}/bin/*.py"/>
       </tarfileset>
       <tarfileset dir="${dist.name}/.." username="ant" group="ant">
-        <include name="${dist.name}/**"/>
+        <include name="${dist.name}/"/>
         <exclude name="${dist.name}/bin/ant"/>
         <exclude name="${dist.name}/bin/antRun"/>
         <exclude name="${dist.name}/bin/*.pl"/>
@@ -1160,7 +1119,6 @@
     <delete dir="${dist.name}"/>
     <checksums>
       <fileset dir="${dist.base.binaries}/">
-        <include name="**/*"/>
         <exclude name="**/*.asc"/>
         <exclude name="**/*.md5"/>
         <exclude name="**/*.sha1"/>
@@ -1177,7 +1135,7 @@
         <include name="${dist.name}/build.sh"/>
       </zipfileset>
       <fileset dir="${dist.name}/..">
-        <include name="${dist.name}/**"/>
+        <include name="${dist.name}/"/>
         <exclude name="${dist.name}/bootstrap.sh"/>
         <exclude name="${dist.name}/build.sh"/>
       </fileset>
@@ -1192,7 +1150,7 @@
         <include name="${dist.name}/build.sh"/>
       </tarfileset>
       <tarfileset dir="${dist.name}/.." username="ant" group="ant">
-        <include name="${dist.name}/**"/>
+        <include name="${dist.name}/"/>
         <exclude name="${dist.name}/bootstrap.sh"/>
         <exclude name="${dist.name}/build.sh"/>
       </tarfileset>
@@ -1205,7 +1163,6 @@
     <delete dir="${dist.name}"/>
     <checksums>
       <fileset dir="${dist.base.source}/">
-        <include name="**/*"/>
         <exclude name="**/*.asc"/>
         <exclude name="**/*.md5"/>
         <exclude name="**/*.sha1"/>
@@ -1684,7 +1641,7 @@ see ${build.junit.reports} / ${antunit.reports}
           <exclude name="${ant.package}/types/selectors/BaseSelectorTest.java"/>
 
           <!-- helper classes, not testcases -->
-          <exclude name="org/example/**"/>
+          <exclude name="org/example/"/>
           <exclude name="${taskdefs.package}/TaskdefTest*Task.java"/>
           <exclude name="${optional.package}/junit/TestFormatter.java"/>
 
diff --git a/release/ivy.xml b/release/ivy.xml
index d199c1a30..5c558a8fb 100644
--- a/release/ivy.xml
+++ b/release/ivy.xml
@@ -100,10 +100,6 @@
     <artifact name="ant-netrexx" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-netrexx" type="jar" ext="jar"/>
     <artifact name="ant-netrexx" type="jar.asc" ext="jar.asc"/>
-    <artifact name="ant-nodeps" type="pom" ext="pom"/>
-    <artifact name="ant-nodeps" type="pom.asc" ext="pom.asc"/>
-    <artifact name="ant-nodeps" type="jar" ext="jar"/>
-    <artifact name="ant-nodeps" type="jar.asc" ext="jar.asc"/>
     <artifact name="ant-swing" type="pom" ext="pom"/>
     <artifact name="ant-swing" type="pom.asc" ext="pom.asc"/>
     <artifact name="ant-swing" type="jar" ext="jar"/>
diff --git a/src/etc/poms/ant-apache-xalan2/pom.xml b/src/etc/poms/ant-apache-xalan2/pom.xml
index 5edc0ad96..fb57a275d 100644
--- a/src/etc/poms/ant-apache-xalan2/pom.xml
+++ b/src/etc/poms/ant-apache-xalan2/pom.xml
@@ -40,12 +40,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
       <version>1.8.2-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.ant</groupId>
-      <artifactId>ant-nodeps</artifactId>
-      <version>1.8.2-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>xalan</groupId>
       <artifactId>xalan</artifactId>
diff --git a/src/etc/poms/ant-nodeps/pom.xml b/src/etc/poms/ant-nodeps/pom.xml
deleted file mode 100644
index 3a6113152..000000000
--- a/src/etc/poms/ant-nodeps/pom.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<!--
-  This POM has been created manually by the Ant Development Team.
-  Please contact us if you are not satisfied with the data contained in this POM.
-  URL : http://ant.apache.org
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>org.apache.ant</groupId>
-    <artifactId>ant-parent</artifactId>
-    <relativePath>../pom.xml</relativePath>
-    <version>1.8.2-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.ant</groupId>
-  <artifactId>ant-nodeps</artifactId>
-  <version>1.8.2-SNAPSHOT</version>
-  <description>contains all the optional tasks and types which do not have particular dependencies</description>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.ant</groupId>
-      <artifactId>ant</artifactId>
-      <version>1.8.2-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
-          <includes>
-            <include>org/apache/tools/ant/taskdefs/optional/**</include>
-            <include>org/apache/tools/ant/types/optional/**</include>
-            <include>org/apache/tools/ant/util/depend/*</include>
-            <include>org/apache/tools/ant/util/optional/**</include>
-            <include>org/apache/tools/ant/util/java15/**</include>
-            <include>org/apache/tools/ant/util/regexp/Jdk14Regexp*</include>
-          </includes>
-          <excludes>
-            <exclude>org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/junit/**</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/perforce/**</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/Script*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/script/**</exclude>
-            <exclude>org/apache/tools/ant/util/optional/Script*</exclude>
-            <exclude>org/apache/tools/ant/types/optional/*Script*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/NetRexxC*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/ejb/Ejbc*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/ejb/DDCreator*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/net/Telnet*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/net/FTP*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/net/RExec*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/scm/AntStarTeam*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/ANTLR*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/sound/*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/image/*</exclude>
-            <exclude>org/apache/tools/ant/types/optional/image/*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/jdepend/*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/splash/*</exclude>
-            <exclude>org/apache/tools/ant/taskdefs/optional/ssh/*</exclude>
-            
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-    <sourceDirectory>../../../../src/main</sourceDirectory>
-    <testSourceDirectory>../../../../src/testcases</testSourceDirectory>
-    <outputDirectory>../../../../target/ant-nodeps/classes</outputDirectory>
-    <testOutputDirectory>../../../../target/ant-nodeps/testcases</testOutputDirectory>
-    <directory>../../../../target/ant-nodeps</directory>
-  </build>
-</project>
diff --git a/src/etc/poms/ant/pom.xml b/src/etc/poms/ant/pom.xml
index 6b2cedd2b..40f8b37cc 100644
--- a/src/etc/poms/ant/pom.xml
+++ b/src/etc/poms/ant/pom.xml
@@ -93,27 +93,36 @@
           <source>1.4</source>
           <target>1.4</target>
           <excludes>
-            <exclude>org/apache/tools/ant/taskdefs/optional/**</exclude>
             <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
-            <exclude>org/apache/tools/ant/types/optional/**</exclude>
             <exclude>org/apache/tools/ant/types/resolver/**</exclude>
-            <exclude>org/apache/tools/ant/util/ScriptRunner.java</exclude>
-            <exclude>org/apache/tools/ant/util/depend/**</exclude>
-            <exclude>org/apache/tools/ant/util/optional/**</exclude>
             <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
             <exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>
             <exclude>org/apache/tools/ant/util/regexp/JakartaRegexp*</exclude>
             <exclude>org/apache/tools/ant/util/regexp/JakartaOro*</exclude>
             <exclude>org/apache/tools/ant/taskdefs/email/MimeMailer*</exclude>
             <exclude>org/apache/tools/ant/launch/**</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/net/FTP*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/net/RExec*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/net/TelnetTask*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/perforce/*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/junit/*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/ssh/*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/image/*</exclude>
+            <exclude>org/apache/tools/ant/types/optional/image/*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/Script*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/script/**</exclude>
+            <exclude>org/apache/tools/ant/types/optional/*Script*</exclude>
+            <exclude>org/apache/tools/ant/util/ScriptRunner.java</exclude>
+            <exclude>org/apache/tools/ant/util/optional/ScriptRunner.java</exclude>
+            <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
+            <exclude>org/apache/tools/ant/util/depend/bcel/*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/NetRexxC*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/Xalan2TraceSupport*</exclude>
+            <exclude>org/apache/tools/ant/taskdefs/optional/jdepend/*</exclude>
           </excludes>
           <testExcludes>
-            <exclude>org/apache/tools/ant/taskdefs/optional/**</exclude>
             <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>
-            <exclude>org/apache/tools/ant/types/optional/**</exclude>
             <exclude>org/apache/tools/ant/types/resolver/**</exclude>
-            <exclude>org/apache/tools/ant/util/depend/**</exclude>
-            <exclude>org/apache/tools/ant/util/optional/**</exclude>
             <exclude>org/apache/tools/ant/util/Script*</exclude>
             <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude>
             <exclude>org/apache/tools/ant/listener/CommonsLoggingListener*</exclude>
diff --git a/src/etc/poms/pom.xml b/src/etc/poms/pom.xml
index a8b77d9a6..5fce47c1e 100644
--- a/src/etc/poms/pom.xml
+++ b/src/etc/poms/pom.xml
@@ -87,7 +87,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     <module>ant-junit</module>
     <module>ant-launcher</module>
     <module>ant-netrexx</module>
-    <module>ant-nodeps</module>
     <module>ant-swing</module>
     <module>ant-testutil</module>
   </modules>