diff --git a/ant.spec b/ant.spec
index e309d8d..185f086 100644
--- a/ant.spec
+++ b/ant.spec
@@ -50,7 +50,7 @@
 
 Name:           ant
 Version:        1.8.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          0
 Summary:        Build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -415,6 +415,22 @@ Optional junit tasks for %{name}.
 %description junit -l fr
 Taches junit optionelles pour %{name}.
 
+%if %without bootstrap
+%package testutil
+Summary:        Optional testutil tasks for %{name}
+Group:          Development/Build Tools
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name}-nodeps = %{epoch}:%{version}-%{release}
+Requires:       junit
+Provides:       ant-testutil = %{epoch}:%{version}-%{release}
+
+%description testutil
+Optional testutil tasks for %{name}.
+
+%description testutil -l fr
+Taches testutil additionels pour %{name}.
+%endif
+
 %package scripts
 Summary:        Additional scripts for %{name}
 Group:          Development/Build Tools
@@ -508,7 +524,7 @@ chmod +x %{__perl_requires}
 %build
 export OPT_JAR_LIST=:
 %if %without bootstrap
-%{ant} jars
+%{ant} jars test-jar
 %if %{build_javadoc}
 export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver)
 %{ant} javadocs
@@ -605,6 +621,9 @@ echo "javamail jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/j
 echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jdepend
 echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch
 echo "junit ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit
+%if %without bootstrap
+echo "testutil ant/ant-testutil" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/testutil
+%endif
 %endif
 
 %if %{build_javadoc}
@@ -829,6 +848,15 @@ rm -rf $RPM_BUILD_ROOT
 %{ant_home}/etc/junit-frames.xsl
 %{ant_home}/etc/junit-noframes.xsl
 
+%if %without bootstrap
+%files testutil
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}/%{name}-testutil.jar
+%{_javadir}/%{name}/%{name}-testutil-%{version}.jar
+%{ant_home}/lib/%{name}-testutil.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/testutil
+%endif
+
 %files scripts
 %defattr(0755,root,root,0755)
 %{_bindir}/*.pl
@@ -848,6 +876,9 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------------------------------------------------------------------
 
 %changelog
+* Thu Oct 28 2010 Orion Poplawski <orion@cora.nwra.com> 0:1.8.1-7
+- Build and package ant-testutil
+
 * Thu Oct 7 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.8.1-6
 - Remove jaf from the classpath.