diff --git a/.gitignore b/.gitignore
index 7a23462..05cdc84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-jruby-jcodings-8a3ca9e.tar.gz
-/jruby-jcodings-1.0.5-0-g3e70a1e.tar.gz
-/jruby-jcodings-1.0.9-0-gd50ee0e.tar.gz
+/jcodings-*.tar.gz
+/*.src.rpm
diff --git a/jcodings.spec b/jcodings.spec
index c9a5eab..5fe38d0 100644
--- a/jcodings.spec
+++ b/jcodings.spec
@@ -1,61 +1,64 @@
-%global commit_hash d50ee0e
-%global tag_hash d50ee0e
-
 # Prevent brp-java-repack-jars from being run.
 %define __jar_repack %{nil}
 
 Name:           jcodings
-Version:        1.0.9
-Release:        20%{?dist}
+Version:        1.0.36
+Release:        1%{?dist}
 Summary:        Java-based codings helper classes for Joni and JRuby
 
 License:        MIT
-URL:            http://github.com/jruby/%{name}
-Source0:        https://github.com/jruby/jcodings/tarball/%{version}/jruby-%{name}-%{version}-0-g%{commit_hash}.tar.gz
-
-BuildArch:      noarch
+URL:            https://github.com/jruby/%{name}
+Source0:        https://github.com/jruby/%{name}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:  maven-local
-BuildRequires:  maven-source-plugin
+BuildRequires:  mvn(junit:junit)
+
+BuildArch: noarch
 
 %description
 Java-based codings helper classes for Joni and JRuby.
 
 %package javadoc
-Summary:        API documentation for %{name}
+Summary: API documentation for %{name}
 
 %description javadoc
 %{summary}.
 
 %prep
-%setup -q -n jruby-%{name}-%{tag_hash}
+%setup -q -n %{name}-%{name}-%{version}
 
 find -name '*.class' -delete
 find -name '*.jar' -delete
 
 %mvn_file : %{name}
 
-# remove unnecessary dependency on maven-javadoc-plugin
-%pom_remove_plugin :maven-javadoc-plugin
+# Remove pointless parent pom
+%pom_remove_parent
+
+# Remove wagon extension
+%pom_xpath_remove "pom:build/pom:extensions"
 
-# remove maven-compiler-plugin configuration that is broken with Java 11
-%pom_xpath_remove 'pom:plugin[pom:artifactId="maven-compiler-plugin"]/pom:configuration'
+# Remove plugins not relevant for downstream RPM builds
+%pom_remove_plugin :maven-javadoc-plugin
+%pom_remove_plugin :maven-source-plugin
 
 %build
-echo "See %{url} for more info about the %{name} project." > README.txt
-
-%pom_xpath_remove "pom:build/pom:extensions"
-%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
+%mvn_build
 
 %install
 %mvn_install
 
 %files -f .mfiles
-%doc README.txt
+%license LICENSE.txt
+%doc README.md
 
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Wed Sep 02 2020 Mat Booth <mat.booth@redhat.com> - 1.0.36-1
+- Update to a version that properly supports JDK 9+
+- Modernise specfile
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index ff6e30f..e65f1e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e8119f5bdd5d9d89283ae19b1c20ef2  jruby-jcodings-1.0.9-0-gd50ee0e.tar.gz
+SHA512 (jcodings-1.0.36.tar.gz) = f10c55e72123a6167a1fbe4cda24bbc367a9bbfea47a61c948d67b4c74cf0a7d656567dfbb9399e11e219b51a75f8c33654e985030615cb91a22db43ec5450b0