diff --git a/.gitignore b/.gitignore
index 06e5a6d..f5ab4c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 plexus-cipher-1.5.tar.gz
 /LICENSE-2.0.txt
 /plexus-cipher-1.7.tar.gz
+/plexus-cipher-1.8.tar.gz
diff --git a/plexus-cipher.spec b/plexus-cipher.spec
index 40c736c..2d5a5df 100644
--- a/plexus-cipher.spec
+++ b/plexus-cipher.spec
@@ -1,19 +1,15 @@
 %bcond_with bootstrap
 
 Name:           plexus-cipher
-Version:        1.7
-Release:        24%{?dist}
+Version:        1.8
+Release:        1%{?dist}
 Summary:        Plexus Cipher: encryption/decryption Component
 License:        ASL 2.0
 # project moved to GitHub and it looks like there is no official website anymore
 URL:            https://github.com/codehaus-plexus/plexus-cipher
 BuildArch:      noarch
 
-# git clone https://github.com/sonatype/plexus-cipher.git
-# cd plexus-cipher/
-# note this is version 1.7 + our patches which were incorporated by upstream maintainer
-# git archive --format tar --prefix=plexus-cipher-1.7/ 0cff29e6b2e | gzip -9 > plexus-cipher-1.7.tar.gz
-Source0:        %{name}-%{version}.tar.gz
+Source0:        %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:  maven-local-openjdk8
 %if %{with bootstrap}
@@ -31,22 +27,20 @@ Plexus Cipher: encryption/decryption Component
 %{?javadoc_package}
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{name}-%{version}
 
-%pom_remove_parent
-%pom_xpath_inject "pom:dependency[pom:artifactId='junit']" "<scope>test</scope>"
+%pom_remove_parent .
 
-# replace %{version}-SNAPSHOT with %{version}
-%pom_xpath_replace pom:project/pom:version "<version>%{version}</version>"
+%pom_xpath_inject 'pom:project' '<groupId>org.codehaus.plexus</groupId>' .
 
 # fedora moved from sonatype sisu to eclipse sisu. sisu-inject-bean artifact
 # doesn't exist in eclipse sisu. this artifact contains nothing but
 # bundled classes from atinject, cdi-api, aopalliance and maybe others.
 %pom_remove_dep org.sonatype.sisu:sisu-inject-bean
-%pom_add_dep javax.inject:javax.inject:1:provided
-%pom_add_dep javax.enterprise:cdi-api:1.0:provided
 
-%pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/*" 1.6
+%pom_add_dep javax.inject:javax.inject:1:provided
+
+%pom_add_dep javax.enterprise:cdi-api:1.0:provided
 
 %mvn_file : plexus/%{name}
 
@@ -60,6 +54,9 @@ Plexus Cipher: encryption/decryption Component
 %license LICENSE.txt NOTICE.txt
 
 %changelog
+* Wed Aug 25 2021 Didik Supriadi <didiksupriadi41@gmail.com> - 1.8-1
+- Update to version 1.8
+
 * Tue Jul 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-24
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/sources b/sources
index 647e333..8c416b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (plexus-cipher-1.7.tar.gz) = fab57bc55519c29f0d0ae6c37a076d1a00b7ecdae50408705e31595d4dae8fd4a771cfe3b28be2afedc0b89dd5270f4b6abafc0b04019f8e406c667bf2f78bea
+SHA512 (plexus-cipher-1.8.tar.gz) = 1c0ec0a4d2d8c2e43c3afc7e17e6a7fa21cfd9db609050f47082fa9858fe44e71c85cb0f2a2b8aae667651e6fffb10590be1eaa2e92b4baa5e0179191e7b4360