diff --git a/.cvsignore b/.cvsignore
index 8455b0e..0e8dcf2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
 apache-ant-1.5.2-src.tar.bz2
-rhug-jakarta-ant-20040524.tar.bz2
diff --git a/ant.spec b/ant.spec
index e7a1f63..3e3a830 100644
--- a/ant.spec
+++ b/ant.spec
@@ -1,47 +1,44 @@
-%define rhugversion 20040524
-%define rhugsource1 apache-%{name}-%{version} upstream
-%define rhugpatches 6 9 10
-
 Summary: Build tool for Java applications
 Name: ant
 Version: 1.5.2
-Release: 27
+Release: 28
 URL: http://ant.apache.org/
-Source: rhug-jakarta-%{name}-%{rhugversion}.tar.bz2
-Source1: apache-%{name}-%{version}-src.tar.bz2
+Source: apache-%{name}-%{version}-src.tar.bz2
+Source1: katana.omissions
 Source2: ant.conf
 Source3: README.anthome
-Patch1: %{name}-rhjpp.patch
+Source4: katana.executables
 Patch6: %{name}-interpreter.patch
-Patch7: %{name}-bz104986.patch
-Patch8: %{name}-gcj34.patch
 Patch9: %{name}-ecj.patch
 Patch10: %{name}-nag29020.patch
+Patch11: %{name}-build.patch
 License: Apache Software License
 Group: Development/Tools
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildPrereq: gcc34-c++
-BuildPrereq: gcc34-java >= 3.4.0-1
-BuildPrereq: xerces-j >= 2.2.1-16
-BuildPrereq: commons-logging >= 1.0.2-15
-BuildPrereq: jakarta-regexp >= 1.2-15
-BuildPrereq: xalan-j >= 2.4.1-14
-BuildPrereq: bcel >= 5.0-13
-BuildPrereq: jaf >= 20030319-4
-BuildPrereq: javamail >= 20031006-4
-BuildPrereq: junit >= 3.8.1-4
-BuildPrereq: ecj
-Requires: libgcj34 >= 3.4.0-1
-Requires: xerces-j >= 2.2.1-16
-Requires: commons-logging >= 1.0.2-15
-Requires: jakarta-regexp >= 1.2-15
-Requires: xalan-j >= 2.4.1-14
-Requires: bcel >= 5.0-13
-Requires: jaf >= 20030319-4
-Requires: javamail >= 20031006-4
-Requires: junit >= 3.8.1-4
-Requires: ecj
+BuildPrereq: katana-build
+BuildPrereq: gcc-java >= 3.4.0
+BuildPrereq: bootstrap-ant
+BuildPrereq: xerces-j >= 2.2.1-17
+BuildPrereq: commons-logging >= 1.0.2-16
+BuildPrereq: jakarta-regexp >= 1.2-16
+BuildPrereq: xalan-j >= 2.4.1-15
+BuildPrereq: bcel >= 5.0-14
+BuildPrereq: jaf >= 20030319-5
+BuildPrereq: javamail >= 20031006-5
+BuildPrereq: junit >= 3.8.1-5
+BuildPrereq: ecj >= 2.1.3-2
+Requires: libgcj >= 3.4.0
+Requires: xerces-j >= 2.2.1-17
+Requires: commons-logging >= 1.0.2-16
+Requires: jakarta-regexp >= 1.2-16
+Requires: xalan-j >= 2.4.1-15
+Requires: bcel >= 5.0-14
+Requires: jaf >= 20030319-5
+Requires: javamail >= 20031006-5
+Requires: junit >= 3.8.1-5
+Requires: ecj >= 2.1.3-2
 Requires: ant-core = %{version}-%{release}
+ExcludeArch: ppc64 ia64
 
 %description
 Ant is a platform-independant build tool for Java applications that is
@@ -50,16 +47,16 @@ used by Apache Jakarta and XML projects.
 %package core
 Summary: The core classes required by Ant
 Group: System Environment/Libraries
-Prereq: redhat-java-rpm-scripts >= 1.0.2-2
-Requires: libgcj34 >= 3.4.0-1
-Requires: xerces-j >= 2.2.1-16
-Requires: commons-logging >= 1.0.2-15
-Requires: jakarta-regexp >= 1.2-15
-Requires: xalan-j >= 2.4.1-14
-Requires: bcel >= 5.0-13
-Requires: jaf >= 20030319-4
-Requires: javamail >= 20031006-4
-Requires: ecj
+Prereq: katana
+Requires: libgcj >= 3.4.0
+Requires: xerces-j >= 2.2.1-17
+Requires: commons-logging >= 1.0.2-16
+Requires: jakarta-regexp >= 1.2-16
+Requires: xalan-j >= 2.4.1-15
+Requires: bcel >= 5.0-14
+Requires: jaf >= 20030319-5
+Requires: javamail >= 20031006-5
+Requires: ecj >= 2.1.3-2
 
 %description core
 The core classes required by Ant.
@@ -67,11 +64,11 @@ The core classes required by Ant.
 %package optional
 Summary: Optional tasks for Ant
 Group: System Environment/Libraries
-Prereq: redhat-java-rpm-scripts >= 1.0.2-2
-Requires: libgcj34 >= 3.4.0-1
-Requires: xerces-j >= 2.2.1-16
-Requires: xalan-j >= 2.4.1-14
-Requires: junit >= 3.8.1-4
+Prereq: katana
+Requires: libgcj >= 3.4.0
+Requires: xerces-j >= 2.2.1-17
+Requires: xalan-j >= 2.4.1-15
+Requires: junit >= 3.8.1-5
 Requires: ant-core = %{version}-%{release}
 
 %description optional
@@ -87,39 +84,50 @@ The ant-devel package contains the headers required to develop
 Cygnus Native Interface (CNI) extensions that use Ant.
 
 %prep
-%setup -q -a 1
-mv %{rhugsource1}
-%patch1 -p0 -b .rhjpp
-%patch6 -p0 -b .interpreter
-%patch7 -p0 -b .bz104986
-%patch8 -p0 -b .gcj34
-%patch9 -p0 -b .ecj
-%patch10 -p0 -b .nag29020
-mv ChangeLog ChangeLog.rhug
-mv TODO TODO.rhug
-for f in version.txt defaultManifest.mf; do
-    f=upstream/src/main/org/apache/tools/ant/$f
-    sed -e "s:@VERSION@:%{version}-%{release}:g"\
-        -e "s:@DATE@:`date '+%B %e %Y'`:g" \
-	< $f > $f.tmp && mv -f $f.tmp $f
-done
+%setup -q -n apache-%{name}-%{version}
+%patch6 -p1 -b .interpreter
+%patch9 -p1 -b .ecj
+%patch10 -p1 -b .nag29020
+%patch11 -p1 -b .build
+katana prep
 
 %build
-CC=gcc34 CXX=g++34 GCJ=gcj34 GCJH=gcjh34 \
-./configure \
-    --disable-static \
-    --prefix=%{_prefix} \
-    --libdir=%{_libdir}
-make
+# XXX hack ecj doesn't build this class correctly
+mkdir -p build/classes
+gcj -d build/classes \
+    -classpath %{_datadir}java/xmlParserAPIs.jar:src/main \
+    -C src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
+# XXX end of hack
+
+CLASSPATH=%{_datadir}/java/xmlParserAPIs.jar:%{_datadir}/java/xalan.jar:%{_datadir}/java/junit.jar:%{_datadir}/java/jakarta-regexp.jar:%{_datadir}/java/commons-logging-apis.jar:%{_datadir}/java/bcel.jar:%{_datadir}/java/activation.jar:%{_datadir}/java/mail.jar:%{_datadir}/java/ecj.jar bootstrap-ant
+
+mkdir jar
+(cd jar
+ jar xf ../build/lib/optional.jar
+ rm -f META-INF/LICENSE.txt
+ mv org/apache/tools/ant/taskdefs/optional/TraXLiaison.class ..
+ jar cf ../katana/%{name}-optional-%{version}.jar .
+ for i in taskdefs types util; do
+      jar cf ../katana/lib-org-apache-tools-ant-$i-optional.so_%{name}-optional-%{version}.jar org/apache/tools/ant/$i
+ done)
+rm -Rf jar/*
+(cd jar
+ jar xf ../build/lib/%{name}.jar
+ rm -f META-INF/LICENSE.txt images/ant_logo_large.gif
+ mkdir org/apache/tools/ant/taskdefs/optional
+ mv ../TraXLiaison.class $_
+ jar cf ../katana/%{name}-%{version}.jar .)
+rm -Rf jar
+katana build
+
+mv src/main/org katana
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
-find ${RPM_BUILD_ROOT}%{_libdir} -type l | xargs rm -f
+katana install
+mv ${RPM_BUILD_ROOT}%{_bindir}/ant-%{version} ${RPM_BUILD_ROOT}%{_bindir}/ant
 
 # Install stuff for classic-ant
-install -m 755 upstream/src/script/ant ${RPM_BUILD_ROOT}%{_bindir}/classic-ant
+install -m 755 src/script/ant ${RPM_BUILD_ROOT}%{_bindir}/classic-ant
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}
 install -m 644 $RPM_SOURCE_DIR/ant.conf ${RPM_BUILD_ROOT}%{_sysconfdir}
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/ant/lib
@@ -168,11 +176,11 @@ done
     %{_datadir}/java/ant-optional.jar
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+katana clean
 
 %files
 %defattr(-,root,root)
-%doc *.rhug upstream/{LICENSE,README,WHATSNEW,welcome.html,docs}
+%doc LICENSE README WHATSNEW welcome.html docs
 %config(noreplace) %{_sysconfdir}/ant.conf
 %{_bindir}/*
 %{_datadir}/ant
@@ -185,6 +193,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib-org-apache-tools-tar-%{version}.so
 %{_libdir}/lib-org-apache-tools-zip-%{version}.so
 %{_datadir}/java/ant-%{version}.jar
+%{_datadir}/katana/lib-org-apache-tools-ant-%{version}.cp
+%{_datadir}/katana/lib-org-apache-tools-bzip2-%{version}.cp
+%{_datadir}/katana/lib-org-apache-tools-mail-%{version}.cp
+%{_datadir}/katana/lib-org-apache-tools-tar-%{version}.cp
+%{_datadir}/katana/lib-org-apache-tools-zip-%{version}.cp
 
 %files optional
 %defattr(-,root,root)
@@ -192,12 +205,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib-org-apache-tools-ant-types-optional-%{version}.so
 %{_libdir}/lib-org-apache-tools-ant-util-optional-%{version}.so
 %{_datadir}/java/ant-optional-%{version}.jar
+%{_datadir}/katana/lib-org-apache-tools-ant-taskdefs-optional-%{version}.cp
+%{_datadir}/katana/lib-org-apache-tools-ant-types-optional-%{version}.cp
+%{_datadir}/katana/lib-org-apache-tools-ant-util-optional-%{version}.cp
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/org/apache/tools/*
 
 %changelog
+* Fri Jun  4 2004 Gary Benson <gbenson@redhat.com> 1.5.2-28
+- Build with katana.
+
 * Tue May 25 2004 Gary Benson <gbenson@redhat.com> 1.5.2-27
 - Use in-process ecj as the default compiler.
 - Fix broken links in classic-ant's libraries directory (#122416).
diff --git a/sources b/sources
index e44d69d..1bb26d9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 1989ee829001dba4e21a4efeff430167  apache-ant-1.5.2-src.tar.bz2
-0b7ff32e93367042b8bd5201241481bb  rhug-jakarta-ant-20040524.tar.bz2