diff --git a/general.ent b/general.ent
index b3bce5ae8..eca7a2ad5 100644
--- a/general.ent
+++ b/general.ent
@@ -39,14 +39,15 @@
 
 <![ %release; [
 <![ %sysv; [
-<!ENTITY version         "%relnum;">
+<!ENTITY x86-version     "%relnum;">
 <!ENTITY short-version   "%relnum;">  <!-- Used below in &blfs-book; -->
 ]]>
 <![ %systemd; [
-<!ENTITY version         "%relnum;-systemd">
-<!ENTITY short-version   "stable-systemd"> <!-- Used below in &blfs-book; -->
+<!ENTITY x86-version     "%relnum;-systemd">
+<!ENTITY short-version   "%relnum;-systemd"> <!-- Used below in &blfs-book; -->
 ]]>
-<!ENTITY errata          "&lfs-root;lfs/errata/&version;/">
+<!ENTITY version         "arm64-&x86-version;">
+<!ENTITY errata          "&lfs-root;lfs/errata/&x86-version;/">
 <!ENTITY generic-version "%relnum;"> <!-- Used below in
                                           &patches-root;,
                                           &donwloads-root;, and
@@ -58,14 +59,15 @@
 
 <![ %rc; [
 <![ %sysv; [
-<!ENTITY version         "%relnum;-rc%rcnum;">
+<!ENTITY x86-version     "%relnum;-rc%rcnum;">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; -->
 ]]>
 <![ %systemd; [
-<!ENTITY version         "%relnum;-systemd-rc%rcnum;">
+<!ENTITY x86-version     "%relnum;-systemd-rc%rcnum;">
 <!ENTITY short-version   "systemd">  <!-- Used below in &blfs-book; -->
 ]]>
-<!ENTITY errata          "&lfs-root;lfs/errata/&version;/">
+<!ENTITY version         "arm64-&x86-version;">
+<!ENTITY errata          "&lfs-root;lfs/errata/&x86-version;/">
 <!ENTITY generic-version "%relnum;-rc%rcnum;"> <!-- Used below in
                                                     &patches-root;,
                                                     &downloads-root;, and
@@ -92,7 +94,7 @@
 <!-- Only used for sysv (lfs-bootscripts): -->
 <!ENTITY downloads-root  "&lfs-root;lfs/downloads/&generic-version;/">
 <!ENTITY livecd-root     "&lfs-root;livecd/">
-<!ENTITY test-results    "&lfs-root;lfs/build-logs/&generic-version;/">
+<!ENTITY test-results    "&lfs-root;~xry111/lfs/build-logs/&generic-version;/">
 <!ENTITY secadv          "&lfs-root;lfs/advisories/">
 
 <!-- 5.4 EOL is Dec 2025