diff --git a/.gitignore b/.gitignore
index 1e35a41..10b9239 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 javassist3.9.GA.zip
+javassist-3.14.0-GA.zip
diff --git a/javassist.spec b/javassist.spec
index 42c201a..be2e526 100644
--- a/javassist.spec
+++ b/javassist.spec
@@ -1,14 +1,11 @@
-%define ext_ver .GA
-
 Name:           javassist
-Version:        3.9.0
-Release:        7%{?dist}
+Version:        3.14.0
+Release:        1%{?dist}
 Summary:        The Java Programming Assistant provides simple Java bytecode manipulation
 Group:          Development/Libraries
 License:        MPLv1.1 or LGPLv2+
 URL:            http://www.csg.is.titech.ac.jp/~chiba/javassist/
-Source0:        http://downloads.sourceforge.net/jboss/%{name}3.9.GA.zip
-Patch0:         javassist-buildfile-nosource1.4-nosrcjar.patch
+Source0:        http://downloads.sourceforge.net/jboss/%{name}-%{version}-GA.zip
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -16,14 +13,14 @@ BuildRequires:     java-devel >= 1:1.6.0
 BuildRequires:     jpackage-utils
 
 BuildRequires:     maven2
-BuildRequires:     maven2-plugin-compiler
-BuildRequires:     maven2-plugin-install
-BuildRequires:     maven2-plugin-jar
-BuildRequires:     maven2-plugin-javadoc
-BuildRequires:     maven2-plugin-resources
-BuildRequires:     maven2-plugin-surefire
-BuildRequires:     maven2-plugin-source
-BuildRequires:     maven2-plugin-antrun
+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-source-plugin
+BuildRequires:     maven-antrun-plugin
 BuildRequires:     maven-doxia
 BuildRequires:     maven-doxia-sitetools
 
@@ -45,26 +42,20 @@ source text; Javassist compiles it on the fly. On the other hand, the
 bytecode-level API allows the users to directly edit a class file as
 other editors.
 
-
 %package javadoc
 Summary:           Javadocs for javassist
 Group:             Documentation
-Requires:          %{name} = %{version}-%{release}
 Requires:          jpackage-utils
 
 %description javadoc
 javassist development documentation.
 
-
 %prep
-%setup -q # -n %{name}-%{version}
-%patch0 -p0
+%setup -q -n %{name}-%{version}-GA
 
 find . -name \*.jar -type f -delete
 
-
 %build
-
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
 
@@ -72,7 +63,6 @@ mvn-jpp \
 -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
 install javadoc:javadoc
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -81,46 +71,45 @@ 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 %{name} %{name} %{version}%{ext_ver} JPP %{name}
 
-
 # jar
 install -d $RPM_BUILD_ROOT%{_javadir}
-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
+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
 
 # 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}
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post
 %update_maven_depmap
 
 %postun
 %update_maven_depmap
 
-
 %files
 %defattr(-,root,root,-)
-%doc License.html
+%doc License.html Readme.html
 %{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}%{ext_ver}.jar
-%{_datadir}/maven2/poms/*
-%{_mavendepmapfragdir}
-
+%{_javadir}/%{name}-%{version}.jar
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
 
 %files javadoc
 %defattr(-,root,root,-)
+%doc License.html
 %dir %{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 %{_javadocdir}/%{name}-%{version}/*
 
-
 %changelog
+* Thu Nov 4 2010 Alexander Kurtakov <akurtako@redhat.com> 3.14.0-1
+- Update to 3.14.0 upstream version.
+- Various fixes in preparation for merge review.
+
 * Fri Feb 12 2010 Alexander Kurtakov <akurtako@redhat.com> 3.9.0-7
 - Add maven-doxia BRs.
 
diff --git a/sources b/sources
index 1612d76..3feee94 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b1a54a77359355f10b40129a91f30b00  javassist3.9.GA.zip
+a2d1b4421e3902554d333d009db852a8  javassist-3.14.0-GA.zip