diff --git a/avahi-gacdir.patch b/avahi-gacdir.patch
index 58c08c4..96ece9b 100644
--- a/avahi-gacdir.patch
+++ b/avahi-gacdir.patch
@@ -1,7 +1,7 @@
 Index: avahi-sharp.pc.in
 ===================================================================
---- avahi-sharp.pc.in.orig
-+++ avahi-sharp.pc.in
+--- a/avahi-sharp.pc.in.orig
++++ b/avahi-sharp.pc.in
 @@ -1,6 +1,6 @@
  prefix=@prefix@
  exec_prefix=@prefix@
@@ -12,8 +12,8 @@ Index: avahi-sharp.pc.in
  Description: Mono bindings for the Avahi mDNS/DNS-SD stack
 Index: avahi-sharp/Makefile.am
 ===================================================================
---- avahi-sharp/Makefile.am.orig
-+++ avahi-sharp/Makefile.am
+--- a/avahi-sharp/Makefile.am.orig
++++ b/avahi-sharp/Makefile.am
 @@ -73,10 +73,10 @@ monodoc_DATA = avahi-sharp-docs.zip avah
  endif
  
@@ -29,8 +29,8 @@ Index: avahi-sharp/Makefile.am
  endif
 Index: avahi-sharp/Makefile.in
 ===================================================================
---- avahi-sharp/Makefile.in.orig
-+++ avahi-sharp/Makefile.in
+--- a/avahi-sharp/Makefile.in.orig
++++ b/avahi-sharp/Makefile.in
 @@ -611,10 +611,10 @@ $(ASSEMBLY).config: $(ASSEMBLY).config.i
  @HAVE_DBUS_TRUE@@HAVE_MONODOC_TRUE@@HAVE_MONO_TRUE@	$(AM_V_GEN)$(MDASSEMBLER) --out avahi-sharp-docs --ecma $(srcdir)/en
  
@@ -46,8 +46,8 @@ Index: avahi-sharp/Makefile.in
  # Otherwise a system limit (for SysV at least) may be exceeded.
 Index: avahi-ui-sharp/Makefile.am
 ===================================================================
---- avahi-ui-sharp/Makefile.am.orig
-+++ avahi-ui-sharp/Makefile.am
+--- a/avahi-ui-sharp/Makefile.am.orig
++++ b/avahi-ui-sharp/Makefile.am
 @@ -60,10 +60,10 @@ monodoc_DATA = avahi-ui-sharp-docs.zip a
  endif
  
@@ -63,8 +63,8 @@ Index: avahi-ui-sharp/Makefile.am
  endif
 Index: avahi-ui-sharp/Makefile.in
 ===================================================================
---- avahi-ui-sharp/Makefile.in.orig
-+++ avahi-ui-sharp/Makefile.in
+--- a/avahi-ui-sharp/Makefile.in.orig
++++ b/avahi-ui-sharp/Makefile.in
 @@ -600,10 +600,10 @@ bssh.exe: $(srcdir)/bssh.cs $(ASSEMBLY)
  @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONODOC_TRUE@@HAVE_MONO_TRUE@	$(AM_V_GEN)$(MDASSEMBLER) --out avahi-ui-sharp-docs --ecma $(srcdir)/en
  
diff --git a/avahi.changes b/avahi.changes
index 96599aa..1abb66a 100644
--- a/avahi.changes
+++ b/avahi.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov 27 14:20:42 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Reformat avahi-gacdir.patch to apply as patch -p1.
+- Use %autopatch instead of deprecated %patchN format.
+
 -------------------------------------------------------------------
 Thu Nov 23 07:48:14 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/avahi.spec b/avahi.spec
index b85508e..d12abdb 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -414,8 +414,9 @@ Avahi is an implementation of the DNS Service Discovery and Multicast
 DNS specifications for Zeroconf Computing.
 
 
-# This is the avahi-discover command, only provided for the primary python3 flavor
 
+
+# This is the avahi-discover command, only provided for the primary python3 flavor
 %package -n python3-avahi-gtk
 Summary:        A set of Avahi utilities written in Python Using python-gtk
 Group:          Development/Languages/Python
@@ -495,22 +496,7 @@ sed "s:@docdir@:%{_docdir}:g" <%{SOURCE6} >sysconfig.avahi-autoipd
 cp -a %{SOURCE9} avahi-autoipd/README.SUSE
 sed -ie "s/libevent-[0-9\.]*/libevent/" avahi-libevent.pc.in
 cp -a %{SOURCE12} service-type-database/build-db
-%patch0
-%patch1 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
+%autopatch -p1
 
 %if !%{build_core}
 # Replace all .la references from local .la files to installed versions