diff --git a/_service b/_service
new file mode 100644
index 0000000..51b37e7
--- /dev/null
+++ b/_service
@@ -0,0 +1,14 @@
+<services>
+	<service name="tar_scm" mode="manual">
+		<param name="filename">kbuild</param>
+		<param name="scm">svn</param>
+		<param name="url">http://svn.netlabs.org/repos/kbuild/trunk</param>
+		<param name="revision">3613</param>
+		<param name="versionformat">0.1.9998.svn%r</param>
+	</service>
+	<service name="recompress" mode="manual">
+		<param name="file">*.tar</param>
+		<param name="compression">xz</param>
+	</service>
+	<service name="set_version" mode="manual"/>
+</services>
diff --git a/aarch64.patch b/aarch64.patch
index 2c7484a..83921c8 100644
--- a/aarch64.patch
+++ b/aarch64.patch
@@ -1,8 +1,14 @@
-Index: kbuild-0.1.9998svn3427/kBuild/env.sh
+---
+ kBuild/env.sh                    |    3 +++
+ kBuild/header.kmk                |    4 ++--
+ src/lib/kStuff/include/k/kDefs.h |    2 +-
+ 3 files changed, 6 insertions(+), 3 deletions(-)
+
+Index: kbuild-0.1.9998+svn3613/kBuild/env.sh
 ===================================================================
---- kbuild-0.1.9998svn3427.orig/kBuild/env.sh
-+++ kbuild-0.1.9998svn3427/kBuild/env.sh
-@@ -413,6 +413,9 @@ if test -z "$KBUILD_HOST_ARCH"; then
+--- kbuild-0.1.9998+svn3613.orig/kBuild/env.sh
++++ kbuild-0.1.9998+svn3613/kBuild/env.sh
+@@ -422,6 +422,9 @@ if test -z "$KBUILD_HOST_ARCH"; then
          sparc64|sparcv9)
              KBUILD_HOST_ARCH='sparc64'
              ;;
@@ -12,43 +18,31 @@ Index: kbuild-0.1.9998svn3427/kBuild/env.sh
  
          *)  echo "$0: unknown cpu/arch - $KBUILD_HOST_ARCH" 1>&${ERR_REDIR}
              sleep 1
-Index: kbuild-0.1.9998svn3427/kBuild/header.kmk
+Index: kbuild-0.1.9998+svn3613/kBuild/header.kmk
 ===================================================================
---- kbuild-0.1.9998svn3427.orig/kBuild/header.kmk
-+++ kbuild-0.1.9998svn3427/kBuild/header.kmk
+--- kbuild-0.1.9998+svn3613.orig/kBuild/header.kmk
++++ kbuild-0.1.9998+svn3613/kBuild/header.kmk
 @@ -197,8 +197,8 @@ KBUILD_BLD_TYPES := release profile debu
  # build types. (PORTME)
  #
  KBUILD_OSES      := darwin dos dragonfly freebsd gnuhurd gnukfbsd gnuknbsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic
--KBUILD_ARCHES    := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 ppc64le s390 s390x sh32 sh64 sparc32 sparc64 x32
--KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 ppc64le s390x sh64 sparc64 x32
-+KBUILD_ARCHES    := x86 amd64 noarch alpha arm32 arm64 aarch64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 ppc64le s390 s390x sh32 sh64 sparc32 sparc64 x32
-+KBUILD_ARCHES_64 := amd64 alpha arm64 aarch64 hppa64 ia64 mips64 ppc64 ppc64le s390x sh64 sparc64 x32
- KBUILD_ARCHES_32 := x86 arm32 hppa32 m68k mips32 ppc32 s390 sh32 sparc32
+-KBUILD_ARCHES    := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k loongarch64 mips32 mips64 ppc32 ppc64 ppc64le riscv32 riscv64 s390 s390x sh32 sh64 sparc32 sparc64 x32
+-KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 loongarch64 mips64 ppc64 ppc64le riscv64 s390x sh64 sparc64 x32
++KBUILD_ARCHES    := x86 amd64 noarch alpha arm32 arm64 aarch64 hppa32 hppa64 ia64 m68k loongarch64 mips32 mips64 ppc32 ppc64 ppc64le riscv32 riscv64 s390 s390x sh32 sh64 sparc32 sparc64 x32
++KBUILD_ARCHES_64 := amd64 alpha arm64 aarch64 hppa64 ia64 loongarch64 mips64 ppc64 ppc64le riscv64 s390x sh64 sparc64 x32
+ KBUILD_ARCHES_32 := x86 arm32 hppa32 m68k mips32 ppc32 riscv32 s390 sh32 sparc32
  
  
-Index: kbuild-0.1.9998svn3427/src/lib/kStuff/include/k/kDefs.h
+Index: kbuild-0.1.9998+svn3613/src/lib/kStuff/include/k/kDefs.h
 ===================================================================
---- kbuild-0.1.9998svn3427.orig/src/lib/kStuff/include/k/kDefs.h
-+++ kbuild-0.1.9998svn3427/src/lib/kStuff/include/k/kDefs.h
-@@ -164,6 +164,8 @@
- #define K_ARCH_ARM_64           ( 5 | K_ARCH_BIT_64 | K_ARCH_END_BI)
- /** Motorola 68000 (32-bit). */
- #define K_ARCH_M68K             ( 6 | K_ARCH_BIT_32 | K_ARCH_END_BIG)
-+/** 64-bit AARCH. */
-+#define K_ARCH_AARCH_64           ( 8 | K_ARCH_BIT_64 | K_ARCH_END_LITTLE)
- /** 32-bit MIPS. */
- #define K_ARCH_MIPS_32          ( 7 | K_ARCH_BIT_32 | K_ARCH_END_BI)
- /** 64-bit MIPS. */
-@@ -210,8 +212,10 @@
+--- kbuild-0.1.9998+svn3613.orig/src/lib/kStuff/include/k/kDefs.h
++++ kbuild-0.1.9998+svn3613/src/lib/kStuff/include/k/kDefs.h
+@@ -219,7 +219,7 @@
  #  define K_ARCH    K_ARCH_ALPHA
  # elif defined(__arm__) || defined(__arm32__)
  #  define K_ARCH    K_ARCH_ARM_32
 -# elif defined(__aarch64__) || defined(__arm64__)
-+# elif defined(__arm64__)
++# elif defined(__arm64__) || defined(__aarch64__)
  #  define K_ARCH    K_ARCH_ARM_64
-+# elif defined(__aarch64__)
-+#  define K_ARCH    K_ARCH_AARCH_64
  # elif defined(__hppa__) && defined(__LP64__)
  #  define K_ARCH    K_ARCH_PARISC_64
- # elif defined(__hppa__)
diff --git a/kBuild-c99-2.patch b/kBuild-c99-2.patch
deleted file mode 100644
index f4b291a..0000000
--- a/kBuild-c99-2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-The eval_buffer function expects the end of the string as the
-(optional) last argument, not its length.
-
-Index: src/kmk/loadapi.c
-===================================================================
---- src/kmk/loadapi.c	(revision 3600)
-+++ src/kmk/loadapi.c	(working copy)
-@@ -59,7 +59,7 @@
-   install_variable_buffer (&pbuf, &plen);
- 
-   s = xstrdup (buffer);
--  eval_buffer (s, flp IF_WITH_VALUE_LENGTH_PARAM (strlen (s) /** @todo suboptimal */));
-+  eval_buffer (s, flp IF_WITH_VALUE_LENGTH_PARAM (s + strlen (s) /** @todo suboptimal */));
-   free (s);
- 
-   restore_variable_buffer (pbuf, plen);
diff --git a/kBuild-c99.patch b/kBuild-c99.patch
deleted file mode 100644
index bf35300..0000000
--- a/kBuild-c99.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-Do not treat <strings.h> as an umbrella header for <string.h>
-The two are distinct on GNU/Linux.
-    
-Also add missing #include <string.h> in some files.
-
-Index: kbuild-0.1.9998svn3427/src/sed/lib/getline.c
-===================================================================
---- kbuild-0.1.9998svn3427.orig/src/sed/lib/getline.c
-+++ kbuild-0.1.9998svn3427/src/sed/lib/getline.c
-@@ -9,10 +9,10 @@
- #include <stdio.h>
- #undef getline 			/* bird */
- 
-+#include <string.h>
-+
- #ifdef HAVE_STRINGS_H
- # include <strings.h>
--#else
--# include <string.h>
- #endif /* HAVE_STRINGS_H */
- 
- #ifdef HAVE_STDLIB_H
-Index: kbuild-0.1.9998svn3427/src/sed/lib/mkstemp.c
-===================================================================
---- kbuild-0.1.9998svn3427.orig/src/sed/lib/mkstemp.c
-+++ kbuild-0.1.9998svn3427/src/sed/lib/mkstemp.c
-@@ -2,10 +2,10 @@
- #include "config.h"
- #endif
- 
-+#include <string.h>
-+
- #ifdef HAVE_STRINGS_H
- # include <strings.h>
--#else
--# include <string.h>
- #endif /* HAVE_STRINGS_H */
- 
- #ifdef HAVE_STDLIB_H
-Index: kbuild-0.1.9998svn3427/src/sed/lib/utils.c
-===================================================================
---- kbuild-0.1.9998svn3427.orig/src/sed/lib/utils.c
-+++ kbuild-0.1.9998svn3427/src/sed/lib/utils.c
-@@ -19,16 +19,17 @@
- #include "config.h"
- 
- #include <stdio.h>
-+#include <unistd.h>
- 
- #include <errno.h>
- #ifndef errno
-   extern int errno;
- #endif
- 
-+#include <string.h>
-+
- #ifdef HAVE_STRINGS_H
- # include <strings.h>
--#else
--# include <string.h>
- #endif /* HAVE_STRINGS_H */
- 
- #ifdef HAVE_STDLIB_H
-Index: kbuild-0.1.9998svn3427/src/sed/sed/compile.c
-===================================================================
---- kbuild-0.1.9998svn3427.orig/src/sed/sed/compile.c
-+++ kbuild-0.1.9998svn3427/src/sed/sed/compile.c
-@@ -22,14 +22,13 @@
- #include "strverscmp.h"
- #include <stdio.h>
- #include <ctype.h>
-+#include <string.h>
- 
- #ifdef HAVE_STRINGS_H
- # include <strings.h>
- # ifdef HAVE_MEMORY_H
- #  include <memory.h>
- # endif
--#else
--# include <string.h>
- #endif /* HAVE_STRINGS_H */
- 
- #ifdef HAVE_STDLIB_H
-Index: kbuild-0.1.9998svn3427/src/sed/sed/execute.c
-===================================================================
---- kbuild-0.1.9998svn3427.orig/src/sed/sed/execute.c
-+++ kbuild-0.1.9998svn3427/src/sed/sed/execute.c
-@@ -24,6 +24,7 @@
- 
- #include <stdio.h>
- #include <ctype.h>
-+#include <string.h>
- 
- #include <errno.h>
- #ifndef errno
-@@ -46,8 +47,6 @@ extern int errno;
- 
- #ifdef HAVE_STRINGS_H
- # include <strings.h>
--#else
--# include <string.h>
- #endif /*HAVE_STRINGS_H*/
- #ifdef HAVE_MEMORY_H
- # include <memory.h>
-Index: kbuild-0.1.9998svn3427/src/sed/sed/fmt.c
-===================================================================
---- kbuild-0.1.9998svn3427.orig/src/sed/sed/fmt.c
-+++ kbuild-0.1.9998svn3427/src/sed/sed/fmt.c
-@@ -22,6 +22,7 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <sys/types.h>
-+#include <string.h>
- 
- #if HAVE_LIMITS_H
- # include <limits.h>
-Index: kbuild-0.1.9998svn3427/src/sed/sed/mbcs.c
-===================================================================
---- kbuild-0.1.9998svn3427.orig/src/sed/sed/mbcs.c
-+++ kbuild-0.1.9998svn3427/src/sed/sed/mbcs.c
-@@ -17,6 +17,7 @@
- 
- #include "sed.h"
- #include <stdlib.h>
-+#include <string.h>
- 
- int mb_cur_max;
- 
-Index: kbuild-0.1.9998svn3427/src/sed/sed/regexp.c
-===================================================================
---- kbuild-0.1.9998svn3427.orig/src/sed/sed/regexp.c
-+++ kbuild-0.1.9998svn3427/src/sed/sed/regexp.c
-@@ -19,6 +19,7 @@
- 
- #include <ctype.h>
- #include <stdio.h>
-+#include <string.h>
- #ifdef HAVE_STDLIB_H
- # include <stdlib.h>
- #endif
-Index: kbuild-0.1.9998svn3427/src/sed/sed/sed.c
-===================================================================
---- kbuild-0.1.9998svn3427.orig/src/sed/sed/sed.c
-+++ kbuild-0.1.9998svn3427/src/sed/sed/sed.c
-@@ -22,12 +22,10 @@
- 
- #include "sed.h"
- 
--
- #include <stdio.h>
-+#include <string.h>
- #ifdef HAVE_STRINGS_H
- # include <strings.h>
--#else
--# include <string.h>
- #endif /*HAVE_STRINGS_H*/
- #ifdef HAVE_MEMORY_H
- # include <memory.h>
diff --git a/kBuild-configure-c99-2.patch b/kBuild-configure-c99-2.patch
deleted file mode 100644
index 722c457..0000000
--- a/kBuild-configure-c99-2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: kbuild-0.1.9998svn3427/src/kmk/configure.ac
-===================================================================
---- kbuild-0.1.9998svn3427.orig/src/kmk/configure.ac
-+++ kbuild-0.1.9998svn3427/src/kmk/configure.ac
-@@ -121,6 +121,7 @@ pds_AC_DOS_PATHS
- AC_CACHE_CHECK([for standard gettimeofday], [ac_cv_func_gettimeofday],
-   [ac_cv_func_gettimeofday=no
-    AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <sys/time.h>
-+                  #include <stdlib.h>
-                   int main ()
-                   {
-                     struct timeval t; t.tv_sec = -1; t.tv_usec = -1;
diff --git a/kBuild-configure-c99.patch b/kBuild-configure-c99.patch
deleted file mode 100644
index 36d3f9d..0000000
--- a/kBuild-configure-c99.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Fix some typical C99 compatibility issues in old configure scripts.
-
-diff --git a/src/sed/config/getline.m4 b/src/sed/config/getline.m4
-index ff8b5f4b..52d2e3e7 100644
---- a/src/sed/config/getline.m4
-+++ b/src/sed/config/getline.m4
-@@ -27,7 +27,7 @@ AC_DEFUN([AM_FUNC_GETLINE],
-       if (!in)
- 	return 1;
-       len = getline (&line, &siz, in);
--      exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1);
-+      return (len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1;
-     }
-     ], am_cv_func_working_getline=yes dnl The library version works.
-     , am_cv_func_working_getline=no dnl The library version does NOT work.
-diff --git a/src/sed/configure b/src/sed/configure
-index 0b01618f..b1172113 100755
---- a/src/sed/configure
-+++ b/src/sed/configure
-@@ -2593,7 +2593,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   for ac_declaration in \
--   '' \
-+   '#include <stdlib.h>' \
-    'extern "C" void std::exit (int) throw (); using std::exit;' \
-    'extern "C" void std::exit (int); using std::exit;' \
-    'extern "C" void exit (int) throw ();' \
-@@ -3378,8 +3378,8 @@ main ()
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
- 	|| toupper (i) != TOUPPER (i))
--      exit(2);
--  exit (0);
-+      return 2;
-+  return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
-@@ -5747,7 +5747,7 @@ cat >>conftest.$ac_ext <<_ACEOF
-       if (!in)
- 	return 1;
-       len = getline (&line, &siz, in);
--      exit ((len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1);
-+      return (len == 4 && line && strcmp (line, "foo\n") == 0) ? 0 : 1;
-     }
- 
- _ACEOF
diff --git a/kbuild-0.1.9998+svn3613.tar.xz b/kbuild-0.1.9998+svn3613.tar.xz
new file mode 100644
index 0000000..e4910c5
--- /dev/null
+++ b/kbuild-0.1.9998+svn3613.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:105718d323ada5d77d949b737918e3af987530cfcff7a9bbd5bdcbb94f5d8a9e
+size 17614096
diff --git a/kbuild-0.1.9998svn3427.tar.bz2 b/kbuild-0.1.9998svn3427.tar.bz2
deleted file mode 100644
index 401f36e..0000000
--- a/kbuild-0.1.9998svn3427.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:42bf7a384cd8580f971d29ddd48d6b771e5f53c97ee9d9a73b607610ecb0d80d
-size 2807755
diff --git a/kbuild-armv7l.diff b/kbuild-armv7l.diff
deleted file mode 100644
index c94945f..0000000
--- a/kbuild-armv7l.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kbuild-0.1.9998svn3110/kBuild/env.sh
-===================================================================
---- kbuild-0.1.9998svn3110.orig/kBuild/env.sh
-+++ kbuild-0.1.9998svn3110/kBuild/env.sh
-@@ -356,7 +356,7 @@ if test -z "$KBUILD_HOST_ARCH"; then
-         hppa64|parisc64)
-             KBUILD_HOST_ARCH='hppa64'
-             ;;
--        ia64)
-+        ia64|armv7l)
-             KBUILD_HOST_ARCH='ia64'
-             ;;
-         ppc32|ppc|powerpc)
diff --git a/kbuild-dummy_noreturn.diff b/kbuild-dummy_noreturn.diff
index cd7bb20..f52bd9a 100644
--- a/kbuild-dummy_noreturn.diff
+++ b/kbuild-dummy_noreturn.diff
@@ -1,7 +1,12 @@
-Index: src/kmk/kmkbuiltin/expr.c
+---
+ src/kmk/kmkbuiltin/expr.c              |    2 ++
+ src/kmk/kmkbuiltin/kbuild_protection.c |    1 +
+ 2 files changed, 3 insertions(+)
+
+Index: kbuild-0.1.9998+svn3613/src/kmk/kmkbuiltin/expr.c
 ===================================================================
---- src/kmk/kmkbuiltin/expr.c.orig
-+++ src/kmk/kmkbuiltin/expr.c
+--- kbuild-0.1.9998+svn3613.orig/src/kmk/kmkbuiltin/expr.c
++++ kbuild-0.1.9998+svn3613/src/kmk/kmkbuiltin/expr.c
 @@ -317,6 +317,8 @@ eval6(PEXPRINSTANCE pThis)
  		return v;
  	} else {
@@ -11,10 +16,10 @@ Index: src/kmk/kmkbuiltin/expr.c
  	}
  	/* NOTREACHED */
  }
-Index: src/kmk/kmkbuiltin/kbuild_protection.c
+Index: kbuild-0.1.9998+svn3613/src/kmk/kmkbuiltin/kbuild_protection.c
 ===================================================================
---- src/kmk/kmkbuiltin/kbuild_protection.c.orig
-+++ src/kmk/kmkbuiltin/kbuild_protection.c
+--- kbuild-0.1.9998+svn3613.orig/src/kmk/kmkbuiltin/kbuild_protection.c
++++ kbuild-0.1.9998+svn3613/src/kmk/kmkbuiltin/kbuild_protection.c
 @@ -29,6 +29,7 @@
  #include "config.h"
  #include <sys/types.h>
diff --git a/kbuild-man.diff b/kbuild-man.diff
index e2ba659..6a77f53 100644
--- a/kbuild-man.diff
+++ b/kbuild-man.diff
@@ -1,5 +1,11 @@
---- kmk.pod
-+++ kmk.pod
+---
+ kmk.pod |   24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+Index: kbuild-0.1.9998+svn3613/kmk.pod
+===================================================================
+--- /dev/null
++++ kbuild-0.1.9998+svn3613/kmk.pod
 @@ -0,0 +1,24 @@
 +=head1 NAME
 +
@@ -25,4 +31,3 @@
 +=head1 AUTHOR
 +
 +Torsten Werner <twerner@debian.org>
-
diff --git a/kbuild.changes b/kbuild.changes
index 2bbd6fd..fb62d4c 100644
--- a/kbuild.changes
+++ b/kbuild.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Sep 20 19:12:07 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to snapshot 0.1.9998+svn3613
+  * Qt6 support
+- Switch all patches to the same patch level (p1)
+- Delete kbuild-armv7l.diff (nonsensical change),
+  kBuild-configure-c99.patch, kBuild-configure-c99-2.patch,
+  kBuild-c99.patch, kBuild-c99-2.patch (obsolete)
+- Rework ppc64le.patch: reuse ppc64 arch enumerator value;
+  implement unconditional trap macro
+- Rework aarch64.patch: define aarch64 as a full alias of arm64
+
 -------------------------------------------------------------------
 Fri Jun  7 11:04:30 UTC 2024 - Martin Jambor <mjambor@suse.com>
 
diff --git a/kbuild.spec b/kbuild.spec
index 4156006..af16681 100644
--- a/kbuild.spec
+++ b/kbuild.spec
@@ -16,35 +16,23 @@
 #
 
 
-%define _svnrev 3427
+%define _svnrev 3613
 Name:           kbuild
-Version:        0.1.9998svn%{_svnrev}
+Version:        0.1.9998+svn3613
 Release:        0
 Summary:        Framework for writing simple makefiles for complex tasks
 License:        GPL-2.0-or-later
 Group:          Development/Tools/Building
 URL:            https://svn.netlabs.org/kbuild
-Source0:        %{name}-%{version}.tar.bz2
+Source:         %{name}-%{version}.tar.xz
 Patch0:         kbuild-man.diff
 Patch2:         kbuild-dummy_noreturn.diff
 Patch5:         kbuild-pthread.diff
 Patch6:         kbuild-timestamps.diff
-Patch7:         kbuild-armv7l.diff
 Patch8:         kbuild-wrong-memset.patch
 Patch9:         ppc64le.patch
 Patch10:        aarch64.patch
 Patch13:        glob-lstat.patch
-
-# C99 compatibility patches to resolve boo#1225792:
-# From from https://bugzilla.redhat.com/show_bug.cgi?id=2154544
-Patch14:        kBuild-configure-c99.patch
-# Somehow RedHat did not need this one:
-Patch15:        kBuild-configure-c99-2.patch
-# From from https://bugzilla.redhat.com/show_bug.cgi?id=2154544
-Patch16:        kBuild-c99.patch
-# From from https://bugzilla.redhat.com/show_bug.cgi?id=2154544
-Patch17:        kBuild-c99-2.patch
-
 BuildRequires:  automake
 BuildRequires:  bison
 BuildRequires:  byacc
@@ -67,20 +55,7 @@ The goals of the kBuild framework:
  - Non-recursive makefile method by using sub-makefiles
 
 %prep
-%setup -q
-%patch -P 0
-%patch -P 2
-%patch -P 5 -p1
-%patch -P 6 -p1
-%patch -P 7 -p1
-%patch -P 8 -p1
-%patch -P 9 -p1
-%patch -P 10 -p1
-%patch -P 13 -p1
-%patch -P 14 -p1
-%patch -P 15 -p1
-%patch -P 16 -p1
-%patch -P 17 -p0
+%autosetup -p1
 
 %build
 export CFLAGS="%{optflags} -fno-strict-aliasing"
diff --git a/ppc64le.patch b/ppc64le.patch
index 9b5d257..d0eb5b2 100644
--- a/ppc64le.patch
+++ b/ppc64le.patch
@@ -1,14 +1,15 @@
 ---
- kBuild/env.sh     |    3 +++
- kBuild/header.kmk |    6 +++---
- src/lib/k/kDefs.h |   16 ++++++++++------
- 3 files changed, 16 insertions(+), 9 deletions(-)
+ kBuild/env.sh                         |    3 +++
+ kBuild/header.kmk                     |    6 +++---
+ src/lib/kStuff/include/k/kDefs.h      |    5 ++++-
+ src/lib/kStuff/include/k/kHlpAssert.h |    2 ++
+ 4 files changed, 12 insertions(+), 4 deletions(-)
 
-Index: kbuild-0.1.9998svn3427/kBuild/env.sh
+Index: kbuild-0.1.9998+svn3613/kBuild/env.sh
 ===================================================================
---- kbuild-0.1.9998svn3427.orig/kBuild/env.sh
-+++ kbuild-0.1.9998svn3427/kBuild/env.sh
-@@ -386,6 +386,9 @@ if test -z "$KBUILD_HOST_ARCH"; then
+--- kbuild-0.1.9998+svn3613.orig/kBuild/env.sh
++++ kbuild-0.1.9998+svn3613/kBuild/env.sh
+@@ -383,6 +383,9 @@ if test -z "$KBUILD_HOST_ARCH"; then
          m68k)
              KBUILD_HOST_ARCH='m68k'
              ;;
@@ -18,63 +19,43 @@ Index: kbuild-0.1.9998svn3427/kBuild/env.sh
          mips32|mips)
              KBUILD_HOST_ARCH='mips32'
              ;;
-Index: kbuild-0.1.9998svn3427/kBuild/header.kmk
+Index: kbuild-0.1.9998+svn3613/kBuild/header.kmk
 ===================================================================
---- kbuild-0.1.9998svn3427.orig/kBuild/header.kmk
-+++ kbuild-0.1.9998svn3427/kBuild/header.kmk
+--- kbuild-0.1.9998+svn3613.orig/kBuild/header.kmk
++++ kbuild-0.1.9998+svn3613/kBuild/header.kmk
 @@ -197,8 +197,8 @@ KBUILD_BLD_TYPES := release profile debu
  # build types. (PORTME)
  #
  KBUILD_OSES      := darwin dos dragonfly freebsd gnuhurd gnukfbsd gnuknbsd haiku l4 linux netbsd nt openbsd os2 solaris win os-agnostic
--KBUILD_ARCHES    := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 s390 s390x sh32 sh64 sparc32 sparc64 x32
--KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 s390x sh64 sparc64 x32
-+KBUILD_ARCHES    := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k mips32 mips64 ppc32 ppc64 ppc64le s390 s390x sh32 sh64 sparc32 sparc64 x32
-+KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 mips64 ppc64 ppc64le s390x sh64 sparc64 x32
- KBUILD_ARCHES_32 := x86 arm32 hppa32 m68k mips32 ppc32 s390 sh32 sparc32
+-KBUILD_ARCHES    := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k loongarch64 mips32 mips64 ppc32 ppc64 riscv32 riscv64 s390 s390x sh32 sh64 sparc32 sparc64 x32
+-KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 loongarch64 mips64 ppc64 riscv64 s390x sh64 sparc64 x32
++KBUILD_ARCHES    := x86 amd64 noarch alpha arm32 arm64 hppa32 hppa64 ia64 m68k loongarch64 mips32 mips64 ppc32 ppc64 ppc64le riscv32 riscv64 s390 s390x sh32 sh64 sparc32 sparc64 x32
++KBUILD_ARCHES_64 := amd64 alpha arm64 hppa64 ia64 loongarch64 mips64 ppc64 ppc64le riscv64 s390x sh64 sparc64 x32
+ KBUILD_ARCHES_32 := x86 arm32 hppa32 m68k mips32 ppc32 riscv32 s390 sh32 sparc32
  
  
-@@ -522,7 +522,7 @@ endif
- KBUILD_DEVTOOLS_TRG ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)
- KBUILD_DEVTOOLS_HST ?= $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).$(KBUILD_HOST_ARCH)
+@@ -524,7 +524,7 @@ KBUILD_DEVTOOLS_HST ?= $(KBUILD_DEVTOOLS
+ KBUILD_DEVTOOLS_TRG_NOARCH ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).noarch
+ KBUILD_DEVTOOLS_HST_NOARCH ?= $(KBUILD_DEVTOOLS)/$(KBUILD_HOST).noarch
  
 -if1of ($(KBUILD_TARGET_ARCH), amd64 hppa64 mips64 ppc64 s390x sparc64)
 +if1of ($(KBUILD_TARGET_ARCH), amd64 hppa64 mips64 ppc64 ppc64le s390x sparc64)
   ifeq ($(KBUILD_TARGET_ARCH),amd64)
    KBUILD_DEVTOOLS_TRG_ALT ?= $(KBUILD_DEVTOOLS)/$(KBUILD_TARGET).x86
   else ifeq ($(KBUILD_TARGET_ARCH),hppa64)
-Index: kbuild-0.1.9998svn3427/src/lib/kStuff/include/k/kDefs.h
+Index: kbuild-0.1.9998+svn3613/src/lib/kStuff/include/k/kDefs.h
 ===================================================================
---- kbuild-0.1.9998svn3427.orig/src/lib/kStuff/include/k/kDefs.h
-+++ kbuild-0.1.9998svn3427/src/lib/kStuff/include/k/kDefs.h
-@@ -176,20 +176,22 @@
+--- kbuild-0.1.9998+svn3613.orig/src/lib/kStuff/include/k/kDefs.h
++++ kbuild-0.1.9998+svn3613/src/lib/kStuff/include/k/kDefs.h
+@@ -176,6 +176,7 @@
  #define K_ARCH_POWERPC_32       ( 9 | K_ARCH_BIT_32 | K_ARCH_END_BI)
  /** 64-bit PowerPC. */
  #define K_ARCH_POWERPC_64       ( 9 | K_ARCH_BIT_64 | K_ARCH_END_BI)
-+/** 64-bit PowerPC. */
-+#define K_ARCH_POWERPC_64LE     (15 | K_ARCH_BIT_64 | K_ARCH_END_LITTLE)
++#define K_ARCH_POWERPC_64LE     ( 9 | K_ARCH_BIT_64 | K_ARCH_END_LITTLE)
  /** 32(31)-bit S390. */
--#define K_ARCH_S390_32          (10 | K_ARCH_BIT_32 | K_ARCH_END_BIG)
-+#define K_ARCH_S390_32          (16 | K_ARCH_BIT_32 | K_ARCH_END_BIG)
+ #define K_ARCH_S390_32          (10 | K_ARCH_BIT_32 | K_ARCH_END_BIG)
  /** 64-bit S390. */
--#define K_ARCH_S390_64          (10 | K_ARCH_BIT_64 | K_ARCH_END_BIG)
-+#define K_ARCH_S390_64          (17 | K_ARCH_BIT_64 | K_ARCH_END_BIG)
- /** 32-bit SuperH. */
- #define K_ARCH_SH_32            (11 | K_ARCH_BIT_32 | K_ARCH_END_BI)
- /** 64-bit SuperH. */
- #define K_ARCH_SH_64            (11 | K_ARCH_BIT_64 | K_ARCH_END_BI)
- /** 32-bit SPARC. */
--#define K_ARCH_SPARC_32         (12 | K_ARCH_BIT_32 | K_ARCH_END_BIG)
-+#define K_ARCH_SPARC_32         (18 | K_ARCH_BIT_32 | K_ARCH_END_BIG)
- /** 64-bit SPARC. */
--#define K_ARCH_SPARC_64         (12 | K_ARCH_BIT_64 | K_ARCH_END_BI)
-+#define K_ARCH_SPARC_64         (19 | K_ARCH_BIT_64 | K_ARCH_END_BI)
- /** The end of the valid architecture values (exclusive). */
--#define K_ARCH_MAX              (12+1)
-+#define K_ARCH_MAX              (20)
- /** @} */
- 
- 
-@@ -220,8 +222,10 @@
+@@ -232,8 +233,10 @@
  #  define K_ARCH    K_ARCH_MIPS_64
  # elif defined(__mips__)
  #  define K_ARCH    K_ARCH_MIPS_32
@@ -85,4 +66,17 @@ Index: kbuild-0.1.9998svn3427/src/lib/kStuff/include/k/kDefs.h
 +#  define K_ARCH    K_ARCH_POWERPC_64LE
  # elif defined(__powerpc__) || defined(__ppc__) || defined(__PPC__)
  #  define K_ARCH    K_ARCH_POWERPC_32
- # elif defined(__sparcv9__) || defined(__sparcv9)
+ # elif defined(__riscv)
+Index: kbuild-0.1.9998+svn3613/src/lib/kStuff/include/k/kHlpAssert.h
+===================================================================
+--- kbuild-0.1.9998+svn3613.orig/src/lib/kStuff/include/k/kHlpAssert.h
++++ kbuild-0.1.9998+svn3613/src/lib/kStuff/include/k/kHlpAssert.h
+@@ -59,6 +59,8 @@ extern "C" {
+ # define kHlpAssertBreakpoint() do { __asm__ __volatile__ ("unimp 0"); } while (0) /*??*/
+ #elif defined(__GNUC__) && (K_ARCH == K_ARCH_SPARC_64)
+ # define kHlpAssertBreakpoint() do { __asm__ __volatile__ ("illtrap 0"); } while (0) /*??*/
++#elif defined(__GNUC__) && (K_ARCH == K_ARCH_POWERPC_64 || K_ARCH == K_ARCH_POWERPC_64LE)
++# define kHlpAssertBreakpoint() do { __asm__ __volatile__ ("tw 31,0,0"); } while (0)
+ #else
+ # error "Port Me"
+ #endif