diff --git a/.cvsignore b/.cvsignore
index 26daa36..7a016a5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 apache-ant-1.5.2-src.tar.bz2
-rhug-jakarta-ant-20030919.tar.bz2
+rhug-jakarta-ant-20031106.tar.bz2
diff --git a/ant.spec b/ant.spec
index b9470f3..9f28af2 100644
--- a/ant.spec
+++ b/ant.spec
@@ -1,11 +1,11 @@
-%define rhugversion 20030919
+%define rhugversion 20031106
 %define rhugsource1 apache-%{name}-%{version} upstream
 %define rhugpatches 6
 
 Summary: Build tool for Java applications
 Name: ant
 Version: 1.5.2
-Release: 20
+Release: 21
 URL: http://ant.apache.org/
 Source: rhug-jakarta-%{name}-%{rhugversion}.tar.bz2
 Source1: apache-%{name}-%{version}-src.tar.bz2
@@ -14,10 +14,10 @@ Source3: README.anthome
 Patch1: %{name}-1.5.2-release.patch
 Patch2: %{name}-1.5.2-buildclasspath.patch
 Patch3: %{name}-1.5.2-jarname.patch
-Patch4: %{name}-1.5.2-gcj-ssa.patch
 Patch5: %{name}-1.5.2-hammer.patch
 Patch6: %{name}-1.5.2-interpreter.patch
 Patch7: %{name}-1.5.2-bz104986.patch
+Patch8: %{name}-1.5.2-gcj-ssa.patch
 License: Apache Software License
 Group: Development/Tools
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -28,12 +28,18 @@ BuildPrereq: commons-logging >= 1.0.2-12
 BuildPrereq: jakarta-regexp >= 1.2-12
 BuildPrereq: xalan-j >= 2.4.1-9
 BuildPrereq: bcel >= 5.0-10
+BuildPrereq: jaf
+BuildPrereq: javamail
+BuildPrereq: junit
 Requires: gcc-java-ssa >= 3.5ssa-0.20030801.34
 Requires: xerces-j >= 2.2.1-10
 Requires: commons-logging >= 1.0.2-12
 Requires: jakarta-regexp >= 1.2-12
 Requires: xalan-j >= 2.4.1-9
 Requires: bcel >= 5.0-10
+Requires: jaf
+Requires: javamail
+Requires: junit
 Requires: ant-libs = %{version}-%{release}
 ExclusiveArch: i386 x86_64 ppc ia64
 
@@ -51,6 +57,9 @@ Requires: commons-logging >= 1.0.2-12
 Requires: jakarta-regexp >= 1.2-12
 Requires: xalan-j >= 2.4.1-9
 Requires: bcel >= 5.0-10
+Requires: jaf
+Requires: javamail
+Requires: junit
 
 %description libs
 The ant-libs package contains the libraries required by Ant.
@@ -70,10 +79,10 @@ mv %{rhugsource1}
 %patch1 -p0 -b .release
 %patch2 -p0 -b .buildclasspath
 %patch3 -p0 -b .jarname
-%patch4 -p0 -b .gcj-ssa
 %patch5 -p0 -b .hammer
 %patch6 -p1 -b .interpreter
 %patch7 -p0 -b .bz104986
+%patch8 -p0 -b .gcj-ssa
 mv ChangeLog ChangeLog.rhug
 mv TODO TODO.rhug
 for f in version.txt defaultManifest.mf; do
@@ -102,7 +111,7 @@ make
 rm -rf ${RPM_BUILD_ROOT}
 %makeinstall
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib-org-apache-tools.so
+find ${RPM_BUILD_ROOT}%{_libdir} -type l | xargs rm -f
 
 # Install stuff for classic-ant
 install -m 755 upstream/src/script/ant ${RPM_BUILD_ROOT}%{_bindir}/classic-ant
@@ -157,6 +166,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/org/apache/tools/*
 
 %changelog
+* Thu Nov  6 2003 Gary Benson <gbenson@redhat.com> 1.5.2-21
+- Enable use JavaMail in mail sending tasks.
+- Enable the JUnit tasks.
+
 * Thu Sep 25 2003 Gary Benson <gbenson@redhat.com> 1.5.2-20
 - Fix bad bytecode in jarfile (#104986).
 - Change group to Development/Tools.
diff --git a/sources b/sources
index 13b4a0f..bc127a7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 1989ee829001dba4e21a4efeff430167  apache-ant-1.5.2-src.tar.bz2
-661241257c59dacdb6b849eeb97ae90c  rhug-jakarta-ant-20030919.tar.bz2
+caa1c44c8682ee1fb6c240b70de29de5  rhug-jakarta-ant-20031106.tar.bz2