diff --git a/.gitignore b/.gitignore
index 9444a45..f3b0bd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /plexus-build-api-0.0.6.tar.gz
 /sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz
 /LICENSE-2.0.txt
+/plexus-build-api-0.0.7.tar.gz
diff --git a/plexus-build-api.spec b/plexus-build-api.spec
index 2de3d5a..46941ce 100644
--- a/plexus-build-api.spec
+++ b/plexus-build-api.spec
@@ -2,14 +2,13 @@
 
 Name:           plexus-build-api
 Version:        0.0.7
-Release:        33%{?dist}
+Release:        34%{?dist}
 Summary:        Plexus Build API
 License:        ASL 2.0
-URL:            https://github.com/sonatype/sisu-build-api
+URL:            https://github.com/codehaus-plexus/plexus-build-api
 BuildArch:      noarch
 
-#Fetched from https://github.com/sonatype/sisu-build-api/tarball/plexus-build-api-0.0.7
-Source0:        sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz
+Source0:        https://github.com/codehaus-plexus/plexus-build-api/archive/refs/tags/plexus-build-api-0.0.7.tar.gz
 Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
 
 # Forwarded upstream: https://github.com/sonatype/sisu-build-api/pull/2
@@ -35,14 +34,15 @@ Summary:        Javadoc for %{name}
 API documentation for %{name}.
 
 %prep
-%setup -q -n sonatype-sisu-build-api-f1f8849
+%setup -q -n plexus-build-api-plexus-build-api-0.0.7
 cp -p %{SOURCE1} .
 
 %patch0 -p1
 %patch1 -p1
 
 %pom_remove_parent
-%pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/*" 1.6
+# From upstream commit: https://github.com/codehaus-plexus/plexus-build-api/commit/6566292a7d85e275b824857bdf92d6504bc4824e
+%pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/*" 1.8
 
 %mvn_file : plexus/%{name}
 
@@ -62,6 +62,9 @@ cp -p %{SOURCE1} .
 %doc LICENSE-2.0.txt
 
 %changelog
+* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.0.7-34
+- Set explicit Java compiler source/target levels to 1.8
+
 * Tue Jul 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.7-33
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/sources b/sources
index 7b64611..58b56b9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz) = 3c8d73b390937a33da496c1d43d38c6ee4ed50951859654449c84a38f30e6ed15b218680fd16e747e33928cfc944d13577044edb399110e65f199b7f54702549
+SHA512 (plexus-build-api-0.0.7.tar.gz) = dde7b2be1d993e2be6aaaefeafdb6108198a49c021298857ece2a6c82f1b112c4af6c204409e9efd7e11b07ed94235f5e9f9e643133d8a57507d7860ad70d94a
 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8