diff --git a/5.13.0.tar.gz b/5.13.0.tar.gz
deleted file mode 100644
index a30c685..0000000
--- a/5.13.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:526bff8ffcbc2067a7403f55b01ad8d7a781c098abca79c4ea6c9e80198bb5fd
-size 116027625
diff --git a/_service b/_service
new file mode 100644
index 0000000..555c4af
--- /dev/null
+++ b/_service
@@ -0,0 +1,15 @@
+<services>
+	<service name="tar_scm" mode="disabled">
+		<param name="scm">git</param>
+		<param name="url">https://github.com/java-native-access/jna.git</param>
+		<param name="revision">5.13.0</param>
+		<param name="versionformat">@PARENT_TAG@</param>
+        <param name="exclude">**/*.jar</param>
+        <param name="exclude">dist</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/jna-5.13.0.tar.xz b/jna-5.13.0.tar.xz
new file mode 100644
index 0000000..7dc475f
--- /dev/null
+++ b/jna-5.13.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c090125cd03b05e88a502b2c6e82c6b15c374a0e2b2206d67f6e9afdf1c41fe
+size 4427064
diff --git a/jna.changes b/jna.changes
index 1aca442..7bf2184 100644
--- a/jna.changes
+++ b/jna.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Feb 21 13:35:16 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+- Fetch sources using source service in order to avoid binary files
+  in the tarball
+
 -------------------------------------------------------------------
 Tue Jan 23 15:33:23 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/jna.spec b/jna.spec
index a592916..92c1bb8 100644
--- a/jna.spec
+++ b/jna.spec
@@ -24,7 +24,7 @@ Summary:        Pure Java access to native libraries
 License:        Apache-2.0 OR LGPL-2.1-or-later
 Group:          Development/Libraries/Java
 URL:            https://github.com/twall/jna
-Source0:        https://github.com/twall/%{name}/archive/%{version}.tar.gz
+Source0:        %{name}-%{version}.tar.xz
 Source1000:     %{name}-rpmlintrc
 Patch0:         jna-build.patch
 Patch1:         jna-callback.patch
@@ -35,12 +35,12 @@ BuildRequires:  ant
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 9
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  libX11-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libffi-devel
 BuildRequires:  objectweb-asm
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 Requires:       java >= 1.8
 Provides:       jna-native = %{version}-%{release}
 Obsoletes:      jna-native < %{version}-%{release}
@@ -76,18 +76,14 @@ This package contains the javadocs for %{name}.
 
 %prep
 %setup -q
-# Cleanup the dist tarball
-find . -name '*jar' | xargs rm
-rm -rf dist
-dos2unix OTHERS
-# Then apply patches
-%patch0 -p1 -b .orig
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+
+%patch -P 0 -p1 -b .orig
+%patch -P 1 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
 
 %if 0%{?suse_version} < 1550
-%patch4 -p1
+%patch -P 4 -p1
 %endif
 
 sed -i 's|@LIBDIR@|%{_libdir}/%{name}|' src/com/sun/jna/Native.java
@@ -124,9 +120,9 @@ install -p -m 644 ./contrib/platform/dist/jna-platform-jpms.jar %{buildroot}%{_j
 ln -sf ../%{name}-platform.jar %{buildroot}%{_javadir}/%{name}/%{name}-platform.jar
 
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -p -m 644 build/pom-jna.xml %{buildroot}/%{_mavenpomdir}/%{name}.pom
-install -p -m 644 build/pom-jna-platform.xml %{buildroot}/%{_mavenpomdir}/%{name}-platform.pom
+%{mvn_install_pom} build/pom-jna.xml %{buildroot}/%{_mavenpomdir}/%{name}.pom
 %add_maven_depmap %{name}.pom %{name}.jar -a net.java.dev.jna:jna-jpms
+%{mvn_install_pom} build/pom-jna-platform.xml %{buildroot}/%{_mavenpomdir}/%{name}-platform.pom
 %add_maven_depmap %{name}-platform.pom %{name}-platform.jar -a net.java.dev.jna:platform,net.java.dev.jna:jna-platform-jpms -f contrib
 
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}