diff --git a/.gitignore b/.gitignore
index fb29cc1..e7aae49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /v1.1-alpha.tar.gz
 /jctools-1.2.1.tar.gz
 /jctools-2.0.2.tar.gz
+/jctools-2.1.2.tar.gz
diff --git a/jctools.spec b/jctools.spec
index f4d77f3..631eec7 100644
--- a/jctools.spec
+++ b/jctools.spec
@@ -2,18 +2,21 @@
 %global namedversion %{version}%{?namedreltag}
 
 Name:          jctools
-Version:       2.0.2
-Release:       5%{?dist}
+Version:       2.1.2
+Release:       1%{?dist}
 Summary:       Java Concurrency Tools for the JVM
 License:       ASL 2.0
 URL:           http://jctools.github.io/JCTools/
 Source0:       https://github.com/JCTools/JCTools/archive/v%{namedversion}/%{name}-%{namedversion}.tar.gz
 
-BuildRequires: maven-local
-BuildRequires: mvn(junit:junit)
-BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires: mvn(org.hamcrest:hamcrest-all)
-BuildRequires: mvn(org.ow2.asm:asm-all)
+BuildRequires:  maven-local
+BuildRequires:  mvn(com.github.javaparser:javaparser-core)
+BuildRequires:  mvn(com.google.guava:guava-testlib)
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.codehaus.mojo:exec-maven-plugin)
+BuildRequires:  mvn(org.hamcrest:hamcrest-all)
+BuildRequires:  mvn(org.ow2.asm:asm-util)
 
 BuildArch:     noarch
 
@@ -29,6 +32,13 @@ currently missing from the JDK:
 ° Low contention stats counters
 ° Executor
 
+%package channels
+Summary:       JCTools Channel implementations
+
+%description channels
+Channel implementations for the
+Java Concurrency Tools Library.
+
 %package experimental
 Summary:       JCTools Experimental implementations
 
@@ -55,24 +65,21 @@ find . -name '*.class' -print -delete
 find . -name '*.jar' -print -delete
 
 %pom_xpath_set pom:project/pom:version %{namedversion}
-%pom_xpath_set -r pom:parent/pom:version %{namedversion} %{name}-core %{name}-experimental
+%pom_xpath_set -r pom:parent/pom:version %{namedversion} %{name}-{build,core,channels,experimental}
 
-# Prevent build failure
+# Remove plugins unnecessary for RPM builds
 %pom_remove_plugin :maven-enforcer-plugin
+%pom_remove_plugin :coveralls-maven-plugin
+%pom_remove_plugin :jacoco-maven-plugin
+%pom_remove_plugin :maven-source-plugin %{name}-core
+%pom_remove_plugin :maven-javadoc-plugin %{name}-core
 
 # Unavailable deps
 %pom_disable_module %{name}-benchmarks
 %pom_disable_module %{name}-concurrency-test
 
-# This dep is unused and unneeded
-%pom_remove_dep "com.google.guava:guava-testlib" jctools-experimental
-
-# Not available
-%pom_remove_plugin :cobertura-maven-plugin %{name}-core
-
-# Useless tasks
-%pom_remove_plugin :maven-source-plugin %{name}-core
-%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-javadoc-plugin']/pom:executions" %{name}-core
+# Modern asm deps
+%pom_change_dep ":asm-all" ":asm-util" jctools-{channels,experimental}
 
 # Add OSGi support
 for mod in core experimental; do
@@ -93,8 +100,10 @@ for mod in core experimental; do
  </configuration>'
 done
 
-%build
+# No need to package internal build tools
+%mvn_package :jctools-build __noinstall
 
+%build
 %mvn_build -s
 
 %install
@@ -104,6 +113,8 @@ done
 %doc README.md
 %license LICENSE
 
+%files channels -f .mfiles-%{name}-channels
+
 %files experimental -f .mfiles-%{name}-experimental
 
 %files javadoc -f .mfiles-javadoc
@@ -113,6 +124,9 @@ done
 %license LICENSE
 
 %changelog
+* Wed Feb 13 2019 Mat Booth <mat.booth@redhat.com> - 2.1.2-1
+- Update to latest upstream release
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 2abd9c4..9cd347a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jctools-2.0.2.tar.gz) = 734905d6847664a08557fa9807766bfe2cd57e9562f1dc0d908c9fffc627c1cb7576ac079715004da9a1f2ee958c8373caf60c110ef3de8f7da5bb04775f6f7f
+SHA512 (jctools-2.1.2.tar.gz) = 374c15d2c77846fb866cdc59bd5b9f3830adef5f0db8b285566c9faf9de7315a01be67bb8c86b580003b1a2077ae9b54c64188033985143f0a4de043d68ce947