diff --git a/.gitignore b/.gitignore
index 1087624..ae956e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /jacoco-0.6.2
 /v0.6.3.tar.gz
 /jacoco-0.6.3
+/v0.6.4.tar.gz
diff --git a/jacoco.spec b/jacoco.spec
index 28badd8..59fe822 100644
--- a/jacoco.spec
+++ b/jacoco.spec
@@ -1,8 +1,8 @@
-%global tag 201306030806
+%global tag 201312101107
 
 Name:      jacoco
-Version:   0.6.3
-Release:   5%{?dist}
+Version:   0.6.4
+Release:   1%{?dist}
 Summary:   Java Code Coverage for Eclipse 
 Group:     System Environment/Libraries
 License:   EPL
@@ -27,10 +27,10 @@ BuildRequires:    maven-plugin-tools-javadoc
 BuildRequires:	  maven-plugin-build-helper
 BuildRequires:    dos2unix
 BuildRequires:    fest-assert
-BuildRequires:    objectweb-asm4
+BuildRequires:    objectweb-asm
 Requires:         java >= 1.7
 Requires:         ant
-Requires:         objectweb-asm4
+Requires:         objectweb-asm
 
 %description
 JaCoCo is a free code coverage library for Java, 
@@ -69,24 +69,8 @@ A Jacoco plugin for maven.
 
 #%pom_remove_plugin org.apache.maven.plugins:maven-shade-plugin org.jacoco.agent.rt/pom.xml 
 
-# make sure upstream hasn't sneaked in any jars we don't know about
-JARS=""
-for j in `find -name "*.jar"`; do
-  if [ ! -L $j ]; then
-    JARS="$JARS $j"
-  fi
-done
-if [ ! -z "$JARS" ]; then
-   echo "These jars should be deleted and symlinked to system jars: $JARS"
-   exit 1
-fi
-
 %build
-# Note: Tests must be disabled because they introduce circular dependency
-# right now.
-OPTIONS="-DrandomNumber=${RANDOM} -DskipTychoVersionCheck package javadoc:aggregate" 
-
-mvn-rpmbuild $OPTIONS
+%mvn_build
 
 dos2unix org.jacoco.doc/docroot/doc/.resources/doc.css 
 
@@ -155,6 +139,9 @@ cp -rf target/site/* %{buildroot}%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}/
 
 %changelog
+* Thu Dec 19 2013 Alexander Kurtakov <akurtako@redhat.com> 0.6.4-1
+- Update to 0.6.4 upstream release.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 57e9cf1..7724b2b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-123c9ba37671dd47b7184d7902ad98cb  v0.6.3.tar.gz
+7da10e1faac759ffb3efc009eb2003c5  v0.6.4.tar.gz