diff --git a/javassist.spec b/javassist.spec
index 43de335..d5cc120 100644
--- a/javassist.spec
+++ b/javassist.spec
@@ -1,24 +1,24 @@
 Name:           javassist
-Version:        3.14.0
-Release:        4%{?dist}
+Version:        3.16.1
+Release:        1%{?dist}
 Summary:        The Java Programming Assistant provides simple Java bytecode manipulation
 Group:          Development/Libraries
-License:        MPLv1.1 or LGPLv2+
+License:        MPLv1.1 or LGPLv2+ or ASL 2.0
 URL:            http://www.csg.is.titech.ac.jp/~chiba/javassist/
 Source0:        http://downloads.sourceforge.net/jboss/%{name}-%{version}-GA.zip
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     java-devel >= 1:1.6.0
 BuildRequires:     jpackage-utils
 
-BuildRequires:     maven2
+BuildRequires:     maven
 BuildRequires:     maven-compiler-plugin
 BuildRequires:     maven-install-plugin
 BuildRequires:     maven-jar-plugin
 BuildRequires:     maven-javadoc-plugin
 BuildRequires:     maven-resources-plugin
 BuildRequires:     maven-surefire-plugin
+BuildRequires:     maven-surefire-provider-junit
 BuildRequires:     maven-source-plugin
 BuildRequires:     maven-antrun-plugin
 BuildRequires:     maven-doxia
@@ -27,9 +27,6 @@ BuildRequires:     maven-doxia-sitetools
 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
@@ -53,52 +50,59 @@ javassist development documentation.
 %prep
 %setup -q -n %{name}-%{version}-GA
 
+mkdir runtest
 find . -name \*.jar -type f -delete
 
 %build
 mvn-rpmbuild install javadoc:javadoc
 
 %install
-rm -rf $RPM_BUILD_ROOT
 
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap %{name} %{name} %{version}-GA JPP %{name}
 
 # jar
 install -d $RPM_BUILD_ROOT%{_javadir}
-install -m644 target/%{name}-%{version}-GA.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -m644 target/%{name}-%{version}-GA.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
-# javadoc
-install -d $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}
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{name}:%{name}"
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+# javadoc
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%post
-%update_maven_depmap
+%pre javadoc
+# workaround for rpm bug, can be removed in F-18
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
-%postun
-%update_maven_depmap
 
 %files
 %doc License.html Readme.html
 %{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
 %doc License.html
-%dir %{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
-%{_javadocdir}/%{name}-%{version}/*
 
 %changelog
+* Tue Apr 24 2012 Andy Grimm <agrimm@gmail.com> - 3.16.1-1
+- Update to latest upstream release.
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.15.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Sep 20 2011 Alexander Kurtakov <akurtako@redhat.com> 3.15.0-1
+- Update to latest upstream release.
+- Add javassist:javassist depmap.
+- The project is now triple licensed.
+
+* Wed Aug 31 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.14.0-5
+- Fixes according to current guidelines
+
 * Tue Aug 30 2011 Andy Grimm <agrimm@gmail.com> - 3.14.0-4
 - Switch to Maven 3 build.
 
diff --git a/sources b/sources
index 3feee94..27cc3e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a2d1b4421e3902554d333d009db852a8  javassist-3.14.0-GA.zip
+28c91ea8bc1af935aa1d867555023d72  javassist-3.16.1-GA.zip