diff --git a/acpica-tools.spec b/acpica-tools.spec
index e492c77..265b3b8 100644
--- a/acpica-tools.spec
+++ b/acpica-tools.spec
@@ -136,73 +136,7 @@ This version of the tools is being released under GPLv2 license.
 %setup -q -n acpica-unix2-%{version}
 gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 
-# apply the big-endian patches
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -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
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
-%patch41 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
-
-# apply the remaining patches
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
-%patch105 -p1
-%patch106 -p1
-%patch107 -p1
-%patch108 -p1
-%patch109 -p1
-%patch110 -p1
-%patch111 -p1
-%patch112 -p1
-%patch113 -p1
-%patch114 -p1
-%patch115 -p1
-%ifarch i686 armv7hl
-%patch116 -p1
-%endif
+%autopatch -p1
 
 cp -p %{SOURCE2} README.Fedora
 cp -p %{SOURCE3} iasl.1
diff --git a/ull-32bit.patch b/ull-32bit.patch
index 0568e11..3d8fe39 100644
--- a/ull-32bit.patch
+++ b/ull-32bit.patch
@@ -1,12 +1,15 @@
 diff -Naur acpica-unix2-20200925.orig/source/common/dmtbdump.c acpica-unix2-20200925/source/common/dmtbdump.c
---- acpica-unix2-20200925.orig/source/common/dmtbdump.c	2020-10-16 18:33:41.108600489 -0600
-+++ acpica-unix2-20200925/source/common/dmtbdump.c	2020-10-16 18:35:01.970316862 -0600
-@@ -333,7 +333,7 @@
+--- acpica-unix2-20200925.orig/source/common/dmtbdump.c 2020-10-27 08:50:34.949398104 -0500
++++ acpica-unix2-20200925/source/common/dmtbdump.c      2020-10-27 08:54:27.609955141 -0500
+@@ -333,7 +333,11 @@
      for (i = 0; i < Entries; i++)
      {
          AcpiDmLineHeader2 (Offset, sizeof (UINT64), "ACPI Table Address", i);
--        AcpiOsPrintf ("%16.16lX\n", AcpiUtReadUint64(&Array[i]));
++#if ACPI_MACHINE_WIDTH == 32
 +        AcpiOsPrintf ("%16.16llX\n", AcpiUtReadUint64(&Array[i]));
++#else
+         AcpiOsPrintf ("%16.16lX\n", AcpiUtReadUint64(&Array[i]));
++#endif
          Offset += sizeof (UINT64);
      }
  }