diff --git a/5.2.0.REL.tar.gz b/5.2.0.REL.tar.gz
deleted file mode 100644
index 58c74da..0000000
--- a/5.2.0.REL.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:91c39263b2b367d4f7f8ff1621c274bb56460d0689dc2f94c8a1f66fe777b5ac
-size 127744515
diff --git a/_service b/_service
new file mode 100644
index 0000000..5503b06
--- /dev/null
+++ b/_service
@@ -0,0 +1,26 @@
+<services>
+	<service name="tar_scm" mode="disabled">
+		<param name="scm">git</param>
+		<param name="url">https://github.com/bndtools/bnd.git</param>
+		<param name="revision">5.2.0.REL</param>
+		<param name="match-tag">*.REL</param>
+		<param name="versionformat">@PARENT_TAG@</param>
+		<param name="versionrewrite-pattern">(.*).REL</param>
+        <param name="exclude">gradlew*</param>
+        <param name="exclude">docs</param>
+        <param name="exclude">**.jar</param>
+        <param name="exclude">**.class</param>
+        <param name="exclude">**.ar</param>
+        <param name="exclude">**.gz</param>
+        <param name="exclude">**.bz2</param>
+        <param name="exclude">**.xz</param>
+        <param name="exclude">**.zip</param>
+        <param name="exclude">**.exe</param>
+        <param name="exclude">**.dll</param>
+	</service>
+	<service name="recompress" mode="disabled">
+		<param name="file">*.tar</param>
+		<param name="compression">xz</param>
+	</service>
+	<service name="set_version" mode="disabled"/>
+</services>
diff --git a/aqute-bnd.changes b/aqute-bnd.changes
index efbd1de..3a45e1a 100644
--- a/aqute-bnd.changes
+++ b/aqute-bnd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr 26 17:47:47 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Fetch sources using source_service and don't distribute legally
+  spurious files (bsc#1210878)
+
 -------------------------------------------------------------------
 Wed Nov 10 08:13:30 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/aqute-bnd.spec b/aqute-bnd.spec
index 4b59d84..0fb719f 100644
--- a/aqute-bnd.spec
+++ b/aqute-bnd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package aqute-bnd
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,8 +24,8 @@ Summary:        BND Tool
 License:        Apache-2.0
 Group:          Development/Libraries/Java
 URL:            https://bnd.bndtools.org/
-Source0:        https://github.com/bndtools/bnd/archive/%{version}.REL.tar.gz
-Source1:        bnd-%{version}.REL-build_xml.tar.xz
+Source0:        bnd-%{version}.tar.xz
+Source1:        bnd-%{version}-build_xml.tar.xz
 Source2:        https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.ant/%{version}/biz.aQute.bnd.ant-%{version}.pom
 Source3:        https://repo1.maven.org/maven2/biz/aQute/bnd/aQute.libg/%{version}/aQute.libg-%{version}.pom
 Source4:        https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd/%{version}/biz.aQute.bnd-%{version}.pom
@@ -85,10 +85,7 @@ Group:          Documentation/HTML
 API documentation for %{name}.
 
 %prep
-%setup -q -n bnd-%{version}.REL -a 1
-
-rm gradlew*
-rm -f $(find | grep -E '\.(.ar|exe|tar\.(gz|bz2|xz)|zip)$' | xargs)
+%setup -q -n bnd-%{version} -a 1
 
 mkdir -p lib
 build-jar-repository -s lib \
diff --git a/bnd-5.2.0.REL-build_xml.tar.xz b/bnd-5.2.0-build_xml.tar.xz
similarity index 100%
rename from bnd-5.2.0.REL-build_xml.tar.xz
rename to bnd-5.2.0-build_xml.tar.xz
diff --git a/bnd-5.2.0.tar.xz b/bnd-5.2.0.tar.xz
new file mode 100644
index 0000000..581748b
--- /dev/null
+++ b/bnd-5.2.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cbb03e40bdaa9886996ac0e0a4e847da1533d7f6ca67f647c1323951463a8bd5
+size 3188412
diff --git a/bnd-maven-plugin.changes b/bnd-maven-plugin.changes
index 841cf48..ffeedd5 100644
--- a/bnd-maven-plugin.changes
+++ b/bnd-maven-plugin.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr 26 17:47:47 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Fetch sources using source_service and don't distribute legally
+  spurious files (bsc#1210878)
+
 -------------------------------------------------------------------
 Wed Nov 10 08:13:30 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/bnd-maven-plugin.spec b/bnd-maven-plugin.spec
index 374a0bc..e7e11a0 100644
--- a/bnd-maven-plugin.spec
+++ b/bnd-maven-plugin.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package bnd-maven-plugin
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@ Summary:        BND Maven plugin
 License:        Apache-2.0
 Group:          Development/Libraries/Java
 URL:            https://bnd.bndtools.org/
-Source0:        https://github.com/bndtools/bnd/archive/%{version}.REL.tar.gz
+Source0:        bnd-%{version}.tar.xz
 Patch0:         0001-Disable-removed-commands.patch
 Patch2:         0003-Port-to-OSGI-7.0.0.patch
 Patch3:         aqute-bnd-java8compat.patch
@@ -56,16 +56,13 @@ Group:          Development/Libraries/Java
 API documentation for %{name}.
 
 %prep
-%setup -q -n bnd-%{version}.REL
+%setup -q -n bnd-%{version}
 
 %patch0 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 
-rm gradlew*
-rm -f $(find | grep -E '\.(.ar|exe|tar\.(gz|bz2|xz)|zip)$' | xargs)
-
 pushd maven
 %pom_remove_dep -r :biz.aQute.bnd.maven
 %pom_remove_dep -r :biz.aQute.resolve