diff --git a/1.0.2.tar.gz b/1.0.2.tar.gz
new file mode 100644
index 0000000..0b68c5e
--- /dev/null
+++ b/1.0.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c5f2b543695241c9549bf84151cb37b0c09335f442a36dbdae494e9a35a68f73
+size 114138
diff --git a/_service b/_service
new file mode 100644
index 0000000..b3ae8b4
--- /dev/null
+++ b/_service
@@ -0,0 +1,3 @@
+<services>
+	<service name="download_files" mode="manual"/>
+</services>
diff --git a/jnr-jnr-x86asm-1.0.2-0-g1dead92.tar.gz b/jnr-jnr-x86asm-1.0.2-0-g1dead92.tar.gz
deleted file mode 100644
index 5afe43e..0000000
--- a/jnr-jnr-x86asm-1.0.2-0-g1dead92.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2846693c3af607b1b89eba23e290f9dfd0668b45755cfa6f0708714d7a0ccdae
-size 114165
diff --git a/jnr-x86asm.changes b/jnr-x86asm.changes
index 408ed69..34037ce 100644
--- a/jnr-x86asm.changes
+++ b/jnr-x86asm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jul  8 18:06:02 UTC 2021 - Anton Shvetz <shvetz.anton@gmail.com>
+
+- Change the source link
+- Spec file cleanup
+- Install artifact into %{_javadir}/jnr
+
 -------------------------------------------------------------------
 Fri Jul 24 08:47:52 UTC 2020 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/jnr-x86asm.spec b/jnr-x86asm.spec
index 856cd40..fbe7f88 100644
--- a/jnr-x86asm.spec
+++ b/jnr-x86asm.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package jnr-x86asm
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,16 +16,15 @@
 #
 
 
-%global commit_hash 1dead92
-%global tag_hash 2a7fb9b
-Name:           jnr-x86asm
+%global cluster jnr
+Name:           %{cluster}-x86asm
 Version:        1.0.2
 Release:        0
-Summary:        Pure-java port of asmjit
+Summary:        Pure java x86 and x86_64 assembler
 License:        MIT
 Group:          Development/Libraries/Java
-URL:            https://github.com/jnr/%{name}/
-Source0:        https://github.com/jnr/%{name}/tarball/%{version}/jnr-%{name}-%{version}-0-g%{commit_hash}.tar.gz
+URL:            https://github.com/%{cluster}/%{name}/
+Source0:        %{url}/archive/refs/tags/%{version}.tar.gz
 Source1:        MANIFEST.MF
 Patch0:         add-manifest.patch
 BuildRequires:  fdupes
@@ -34,7 +33,7 @@ BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
 BuildArch:      noarch
 
 %description
-Pure-java port of asmjit (http://code.google.com/p/asmjit/)
+This is a pure-java port of asmjit (http://code.google.com/p/asmjit/).
 
 %package        javadoc
 Summary:        Javadoc for %{name}
@@ -44,20 +43,13 @@ Group:          Documentation/HTML
 Javadoc for %{name}.
 
 %prep
-%setup -q -n jnr-%{name}-%{tag_hash}
+%setup -q
 %patch0
 cp %{SOURCE1} .
-find ./ -name '*.jar' -delete
-find ./ -name '*.class' -delete
-
-%pom_xpath_set "pom:project/pom:properties/pom:maven.compiler.source" "1.6"
-%pom_xpath_set "pom:project/pom:properties/pom:maven.compiler.target" "1.6"
+%{mvn_file} : %{cluster}/%{name}
 
 %build
-%{mvn_build} -f \
-%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-	-- -Dmaven.compiler.release=6
-%endif
+%{mvn_build} -f -- -Dmaven.compiler.{source,target}=8
 
 %install
 %mvn_install