diff --git a/javassist.spec b/javassist.spec
index 130f92e..95d7116 100644
--- a/javassist.spec
+++ b/javassist.spec
@@ -1,6 +1,8 @@
+%define ext_ver .GA
+
 Name:           javassist
 Version:        3.9.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Java Programming Assistant provides simple Java bytecode manipulation
 Group:          Development/Libraries
 License:        MPLv1.1 or LGPLv2+
@@ -12,10 +14,24 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     java-devel >= 1:1.6.0
 BuildRequires:     jpackage-utils
-BuildRequires:     ant
+
+BuildRequires:     maven2
+BuildRequires:     maven2-plugin-compiler
+BuildRequires:     maven2-plugin-install
+BuildRequires:     maven2-plugin-jar
+BuildRequires:     maven2-plugin-javadoc
+BuildRequires:     maven2-plugin-release
+BuildRequires:     maven2-plugin-resources
+BuildRequires:     maven2-plugin-surefire
+BuildRequires:     maven2-plugin-source
+BuildRequires:     maven2-plugin-antrun
+
 Requires:          java >= 1:1.6.0
 Requires:          jpackage-utils
 
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
+
 %description
 Javassist enables Java programs to define a new class at runtime and to
 modify a class file when the JVM loads it. Unlike other similar
@@ -43,24 +59,36 @@ javassist development documentation.
 %setup -q # -n %{name}-%{version}
 %patch0 -p0
 
-rm -rf *.jar html
+find . -name \*.jar -type f -delete
 
 
 %build
-ant clean jar javadocs
+
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+
+mvn-jpp \
+-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+install javadoc:javadoc
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
+%add_to_maven_depmap org.apache.maven %{name} %{version} JPP %{name}
+
+
 # jar
 install -d $RPM_BUILD_ROOT%{_javadir}
-install -m644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -m644 target/%{name}-%{version}%{ext_ver}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}%{ext_ver}.jar
+ln -s %{name}-%{version}%{ext_ver}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # javadoc
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -rp html/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
@@ -68,11 +96,21 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
+
 %files
 %defattr(-,root,root,-)
 %doc License.html
 %{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{name}-%{version}%{ext_ver}.jar
+%{_datadir}/maven2/poms
+%{_mavendepmapfragdir}
+
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -82,5 +120,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 26 2009 John5342 <john5342 at, fedoraproject.org> - 3.9.0-2
+- Build using maven and install maven stuff (fixes bug 480428)
+
 * Tue Dec 16 2008 Sandro Mathys <red at fedoraproject.org> - 3.9.0-1
 - initial build