diff --git a/.gitignore b/.gitignore
index 667054d..e3dc0f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,11 @@
 /asm-util-6.2.pom
 /asm-xml-6.2.pom
 /objectweb-asm-6.2.tar.gz
+/objectweb-asm-6.2.1.tar.gz
+/asm-6.2.1.pom
+/asm-analysis-6.2.1.pom
+/asm-commons-6.2.1.pom
+/asm-test-6.2.1.pom
+/asm-tree-6.2.1.pom
+/asm-util-6.2.1.pom
+/asm-xml-6.2.1.pom
diff --git a/generate-tarball.sh b/generate-tarball.sh
index eac806b..255d107 100755
--- a/generate-tarball.sh
+++ b/generate-tarball.sh
@@ -17,8 +17,10 @@ tar xf "../${name}-${version}.orig.tar.gz"
 mv asm-${gittag}-* ${name}-${version}
 
 # CLEAN TARBALL
+# Remove all jar files
 find -name '*.jar' -delete
-find -name '*.class' -delete
+# Remove all class files except those in asm-test, which are shipped alongside appropriately licensed source
+find */asm{,-analysis,-commons} -name '*.class' -delete
 rm -r */gradle
 
 tar cf "../${name}-${version}.tar.gz" *
diff --git a/objectweb-asm.spec b/objectweb-asm.spec
index ceb671e..b5f0f04 100644
--- a/objectweb-asm.spec
+++ b/objectweb-asm.spec
@@ -2,8 +2,8 @@
 %bcond_without osgi
 
 Name:           objectweb-asm
-Version:        6.2
-Release:        5%{?dist}
+Version:        6.2.1
+Release:        1%{?dist}
 Summary:        Java bytecode manipulation and analysis framework
 License:        BSD
 URL:            http://asm.ow2.org/
@@ -34,7 +34,7 @@ BuildRequires:  mvn(org.codehaus.janino:janino)
 BuildRequires:  mvn(org.junit.jupiter:junit-jupiter-api)
 BuildRequires:  mvn(org.junit.jupiter:junit-jupiter-engine)
 BuildRequires:  mvn(org.junit.jupiter:junit-jupiter-params)
-BuildRequires:  mvn(org.junit.platform:junit-platform-surefire-provider)
+BuildRequires:  mvn(org.apache.maven.surefire:surefire-junit-platform)
 %endif
 
 %if %{with osgi}
@@ -77,14 +77,7 @@ for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util asm-xml; do
   # Fix junit5 configuration
 %if %{with junit5}
   %pom_add_dep org.junit.jupiter:junit-jupiter-engine:5.1.0:test $pom
-  %pom_add_plugin org.apache.maven.plugins:maven-surefire-plugin:2.21.0 $pom \
-"            <dependencies>
-                <dependency>
-                    <groupId>org.junit.platform</groupId>
-                    <artifactId>junit-platform-surefire-provider</artifactId>
-                    <version>1.2.0-RC1</version>
-                </dependency>
-            </dependencies>"
+  %pom_add_plugin org.apache.maven.plugins:maven-surefire-plugin:2.22.0 $pom
 %endif
 %if %{with osgi}
   if [ "$pom" != "asm-test" ] ; then
@@ -106,6 +99,14 @@ for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util asm-xml; do
 %endif
 done
 
+# Disable tests that use unlicensed class files
+sed -i -e '/testReadAndWriteWithComputeMaxsAndLargeSubroutines/i@org.junit.jupiter.api.Disabled("missing class file")' \
+  asm/src/test/java/org/objectweb/asm/ClassWriterTest.java
+sed -i -e '/testMergeWithJsrReachableFromTwoDifferentPaths/i@org.junit.jupiter.api.Disabled("missing class file")' \
+  asm-analysis/src/test/java/org/objectweb/asm/tree/analysis/BasicInterpreterTest.java
+sed -i -e '/testSortLocalVariablesAndInstantiate()/i@org.junit.jupiter.api.Disabled("missing class file")' \
+  asm-commons/src/test/java/org/objectweb/asm/commons/LocalVariablesSorterTest.java
+
 # Insert asm-all pom
 mkdir -p asm-all
 sed 's/@VERSION@/%{version}/g' %{SOURCE9} > asm-all/pom.xml
@@ -147,6 +148,10 @@ popd
 %license LICENSE.txt
 
 %changelog
+* Tue Sep 11 2018 Mat Booth <mat.booth@redhat.com> - 6.2.1-1
+- Update to latest upstream release
+- Fix test suite execution
+
 * Fri Aug 03 2018 Michael Simacek <msimacek@redhat.com> - 6.2-5
 - Repack the tarball without binaries
 
diff --git a/sources b/sources
index 4edcbb4..9c6b364 100644
--- a/sources
+++ b/sources
@@ -1,8 +1,8 @@
-SHA512 (objectweb-asm-6.2.tar.gz) = 52de20e11eb7f09bb47ef7394138c3fb425197c552786bf01e1f17331f2d32481e09ce2dd7267058647e29bcd4cbd0b4e7a2f2f3ee583945b18eefebbe407238
-SHA512 (asm-6.2.pom) = a6cebb211772ac4e13df2c519593da5ce0742bb88d928fc0c2cf9094141f88c4e88dbff29ca6f7b7b3749d0ada02ddc07c27c25493c6562be8dbcecf8a1fcad5
-SHA512 (asm-analysis-6.2.pom) = 853742bb74ffae42314c162f624c8bb2a6149a3fc7763a9ac2ec2528f2381c5b84d7bfd41c61f89e59bd1650a06faf64d4124f6e0fa2cfd23554257949d6006b
-SHA512 (asm-commons-6.2.pom) = c8033bde09af20576aee78237e555620f22de6fccfa9ab8840d7e09657f6d92cf2b467080c18207cf978c4a21af86eba120bd9a19430b264822b55fbfefa5e4f
-SHA512 (asm-test-6.2.pom) = 3ef16fee0924ffd6da3bc3e715574cc6324250707980586beadd1bbee50bf9e709f251593e21c6637d56f5c90db9b7c599b5617f22e4da5bc87932fb610914da
-SHA512 (asm-tree-6.2.pom) = cb8eec7d54024595cd2c13a7fb2e8fec9d04f83ccd0c50b71745fd51a6fb6f4e5e56521b86932f9da3e775dd2a0d3a1fe90c8bf2da3c2ee39453b1019e0efd43
-SHA512 (asm-util-6.2.pom) = 0fcf4c8c0dc98b71cd53f1e2253a5f8293bfed4a673b2d231993365645326a27f8ded6a2879e3f9a341ffeb2cdbb5b8d659c789ee1bd3ed109676f505b61bc18
-SHA512 (asm-xml-6.2.pom) = 078aa27a82b3513080e238830e6ac7cd09e5dd374587544ec55c56a9ddf53d050b660b2f61ed51ff7421fd6134ee0fdf686c4e6c55cbb9fc8f48123eb750c96c
+SHA512 (objectweb-asm-6.2.1.tar.gz) = 203d36483d068beb26e2139ad535f4b386b043f1a5a5e7e6e5f29c1fc04dd0905e22f5746594d5c4bff9c94a90fb7ce1a3d566c3d312a728c14693ed6cc9af97
+SHA512 (asm-6.2.1.pom) = 3d5f1c68c1eb9b4b92655138a611f3ce5fded9183a1abe37473a349f226e2e83b2bf7caa5f7a53a93ab16a392f3ebaa962b1630dd0e9cdc41dc99de975270c40
+SHA512 (asm-analysis-6.2.1.pom) = 6bd4328c59ee0e30af88f2036fb22ba2256013ac97572ae149b8368df2f550e8a356ae86d8cbf172865d7f884366efad76473079bcc77e46ad1c089ad4443856
+SHA512 (asm-commons-6.2.1.pom) = d91a12ea460fbde0c6e8984daf33abac9c724893c5a2de7b2de7e741162fd358b47f4be398bd6813168a65878d0f948d1853d2fcb8f3b9a575f130b1c02acecf
+SHA512 (asm-test-6.2.1.pom) = 273a26015bdecf945df3a30729b9628eed779c0218f9d343c39c1349e947133d9e87e0dc6865a6429a01bf8178e03b86e1c874e3bb1b3c175e3d38c8d6c1941a
+SHA512 (asm-tree-6.2.1.pom) = 4f3150dd6737ca05862769de49df55d8f66882ddeea2bfaaa04852862e4c07ad51ab14a87a92bea55dd611ec5886123331d756cb8fc511c8c0a5b3cba400c033
+SHA512 (asm-util-6.2.1.pom) = e257f5fe8f32c5c35c9ac1b307e1f9a69141a6ed66aa28a0e76b12560b6441b59c84ff3dbd0da185f53bd57517edb95e1b0517b19d0e2299ef4271818e66056b
+SHA512 (asm-xml-6.2.1.pom) = cef15584c25df9e07aa3c1121134545b7e79e678b58340e6d34b7f28c0b9b8c61768dc0d501299c5b489a9f26d28511adc1cbae757a2973201852c28de45d25b