diff --git a/.cvsignore b/.cvsignore
index 438603d..376ac95 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,3 @@
-LogKit-1.2-src.tar.gz
-LogKit-1.2
-avalon-site
+avalon-logkit-1.2-2jpp_1fc.noarch.rpm
 noarch
 *.src.rpm
diff --git a/avalon-logkit.spec b/avalon-logkit.spec
index 1dc09e9..2611722 100644
--- a/avalon-logkit.spec
+++ b/avalon-logkit.spec
@@ -18,25 +18,14 @@ Group:		Development/Libraries/Java
 #Distribution:	JPackage
 #Vendor:		JPackage Project
 Url:		http://avalon.apache.org/%{short_name}/
-Source0:	http://jakarta.apache.org/builds/jakarta-avalon/release/logkit/latest/LogKit-1.2-src.tar.gz
-Patch0:		%{name}-build.patch
+Source0:	%{name}-%{version}-%{release}.noarch.rpm
 Requires:	avalon-framework >= 0:4.1.4
 Requires:	servlet
 %if !%{no_nonfree_deps}
 Requires:	jms
 %endif
 Requires:	jdbc-stdext
-BuildRequires:  jpackage-utils >= 0:1.5
-BuildRequires:	ant
-BuildRequires:  javamail
-BuildRequires:  junit
-BuildRequires:  log4j
-BuildRequires:	avalon-framework >= 0:4.1.4
-BuildRequires:	servlet
-%if !%{no_nonfree_deps}
-BuildRequires:	jms
-%endif
-BuildRequires:	jdbc-stdext
+BuildRequires:	rpm, cpio
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
@@ -45,61 +34,23 @@ LogKit is a logging toolkit designed for secure performance orientated
 logging in applications. To get started using LogKit, it is recomended
 that you read the whitepaper and browse the API docs.
 
-%package javadoc
-Summary:	Javadoc for %{name}
-Group:		Development/Documentation
-
-%description javadoc
-Javadoc for %{name}.
-
-%prep
-rm -rf $RPM_BUILD_ROOT
-%setup -n %{short_Name}-%{version}
-%patch
-# remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
-# delete stuff that doesn't work with gcj log4j (ultimatly #130006).
-if java -version 2>&1 | grep -q "gcj"; then
-    rm -f src/java/org/apache/log/output/lf5/LF5LogTarget.java
-fi
-
-%build
-export CLASSPATH=%(build-classpath log4j javamail/mailapi jms servlet jdbc-stdext avalon-framework junit):$PWD/build/classes
-ant clean jar javadocs
-
 %install
-# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 build/lib/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT
+cd $RPM_BUILD_ROOT
+rpm2cpio %{SOURCE0} | cpio -id --quiet
+rm -Rf $RPM_BUILD_ROOT%{_docdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-    rm -f %{_javadocdir}/%{name}
-fi
-
 %files
 %defattr(0644,root,root,0755)
-%doc KEYS LICENSE
 %{_javadir}/*
 
-%files javadoc
-%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
-
 %changelog
-* Mon Oct 11 2004 Gary Benson <gbenson@redhat.com> 0:1.2-2jpp_1fc
-- Build into Fedora.
+* Thu Oct 14 2004 Gary Benson <gbenson@redhat.com> 0:1.2-2jpp_1fc
+- Bootstrap into Fedora.
 
 * Fri Mar  5 2004 Frank Ch. Eigler <fche@redhat.com> 0:1.2-2jpp_1rh
 - RH vacuuming
diff --git a/sources b/sources
index 2dbda40..b3e07aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17ede0a7d297ad610b47c476757c2b96  LogKit-1.2-src.tar.gz
+a1682d2038f5bb647a8c192b61b2cb2c  avalon-logkit-1.2-2jpp_1fc.noarch.rpm