diff --git a/tomcat-9.0-bootstrap-MANIFEST.MF.patch b/tomcat-9.0-bootstrap-MANIFEST.MF.patch
index fa3c90f..73b7cba 100644
--- a/tomcat-9.0-bootstrap-MANIFEST.MF.patch
+++ b/tomcat-9.0-bootstrap-MANIFEST.MF.patch
@@ -1,5 +1,7 @@
---- res/META-INF/bootstrap.jar.manifest.orig	2010-04-06 10:11:09.000000000 -0600
-+++ res/META-INF/bootstrap.jar.manifest	2010-04-06 10:45:56.000000000 -0600
+Index: apache-tomcat-9.0.82-src/res/META-INF/bootstrap.jar.manifest
+===================================================================
+--- apache-tomcat-9.0.82-src.orig/res/META-INF/bootstrap.jar.manifest
++++ apache-tomcat-9.0.82-src/res/META-INF/bootstrap.jar.manifest
 @@ -1,6 +1,5 @@
  Manifest-Version: 1.0
  Main-Class: org.apache.catalina.startup.Bootstrap
diff --git a/tomcat-9.0-sle.catalina.policy.patch b/tomcat-9.0-sle.catalina.policy.patch
index 9a50f78..da9102a 100644
--- a/tomcat-9.0-sle.catalina.policy.patch
+++ b/tomcat-9.0-sle.catalina.policy.patch
@@ -1,8 +1,8 @@
-Index: conf/catalina.policy
+Index: apache-tomcat-9.0.82-src/conf/catalina.policy
 ===================================================================
---- conf/catalina.policy.orig
-+++ conf/catalina.policy
-@@ -167,6 +167,9 @@ grant {
+--- apache-tomcat-9.0.82-src.orig/conf/catalina.policy
++++ apache-tomcat-9.0.82-src/conf/catalina.policy
+@@ -171,6 +171,9 @@ grant {
      permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat";
  
      // Precompiled JSPs need access to these packages.
@@ -12,7 +12,7 @@ Index: conf/catalina.policy
      permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.el";
      permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime";
      permission java.lang.RuntimePermission
-@@ -216,6 +219,15 @@ grant codeBase "file:${catalina.home}/we
+@@ -220,6 +223,15 @@ grant codeBase "file:${catalina.home}/we
  };
  
  
diff --git a/tomcat-9.0-tomcat-users-webapp.patch b/tomcat-9.0-tomcat-users-webapp.patch
index 8215910..f80eac7 100644
--- a/tomcat-9.0-tomcat-users-webapp.patch
+++ b/tomcat-9.0-tomcat-users-webapp.patch
@@ -1,8 +1,8 @@
-Index: conf/tomcat-users.xml
+Index: apache-tomcat-9.0.82-src/conf/tomcat-users.xml
 ===================================================================
---- conf/tomcat-users.xml.orig
-+++ conf/tomcat-users.xml
-@@ -41,4 +41,14 @@
+--- apache-tomcat-9.0.82-src.orig/conf/tomcat-users.xml
++++ apache-tomcat-9.0.82-src/conf/tomcat-users.xml
+@@ -53,4 +53,14 @@
    <user username="both" password="<must-be-changed>" roles="tomcat,role1"/>
    <user username="role1" password="<must-be-changed>" roles="role1"/>
  -->
diff --git a/tomcat.changes b/tomcat.changes
index 6cc94dc..4d0931a 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Nov 23 12:32:49 UTC 2023 - Ricardo Mestre <ricardo.mestre@suse.com>
+
+- replace prep setup and patches macro with autosetup
+
 -------------------------------------------------------------------
 Fri Oct 13 11:12:07 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/tomcat.spec b/tomcat.spec
index 562d04f..4de51e7 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -241,20 +241,11 @@ Requires:       jakarta-taglibs-standard >= 1.1
 The ROOT and examples web applications for Apache Tomcat
 
 %prep
-%setup -q -n %{packdname} -b33
+%autosetup -p1 -n %{packdname} -b 33
 
 # remove pre-built binaries and windows files
 find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \
           -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -print -delete
-%patch0
-%patch1
-%patch2
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
 
 # remove date from docs
 sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl