diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index f4df04624a..f7fe344d17 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,16 @@
       </itemizedlist>
     </listitem>
     -->
+    <listitem>
+      <para>April 3rd, 2022</para>
+      <itemizedlist>
+        <listitem>
+          <para>[timtas] - Update to emacs-28.1. Fixes
+          <ulink url="&blfs-ticket-root;16371">#16371</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
 
     <listitem>
       <para>April 3rd, 2022</para>
diff --git a/packages.ent b/packages.ent
index a823372af8..fabd5d03c4 100644
--- a/packages.ent
+++ b/packages.ent
@@ -62,7 +62,7 @@
 <!-- Chapter 6 -->
 <!ENTITY bluefish-version             "2.2.12">
 <!ENTITY ed-version                   "1.18">
-<!ENTITY emacs-version                "27.2">
+<!ENTITY emacs-version                "28.1">
 <!ENTITY gedit-version                "42.0">
 <!ENTITY joe-version                  "4.6">
 <!ENTITY juffed-version               "0.10.r71.gc3c1a3f">
diff --git a/postlfs/editors/emacs.xml b/postlfs/editors/emacs.xml
index efa3930c1a..43fd58435c 100644
--- a/postlfs/editors/emacs.xml
+++ b/postlfs/editors/emacs.xml
@@ -7,9 +7,9 @@
   <!ENTITY emacs-download-http "&gnu-http;/emacs/emacs-&emacs-version;.tar.xz">
   <!ENTITY emacs-download-ftp  "&gnu-ftp;/emacs/emacs-&emacs-version;.tar.xz">
   <!ENTITY emacs-download-ftp  " ">
-  <!ENTITY emacs-md5sum        "4c3d9ff35b2ab2fe518dc7eb3951e128">
-  <!ENTITY emacs-size          "43 MB">
-  <!ENTITY emacs-buildsize     "620 MB">
+  <!ENTITY emacs-md5sum        "a74841c74a3b2b8a1af2a504799a6a93">
+  <!ENTITY emacs-size          "46 MB">
+  <!ENTITY emacs-buildsize     "507 MB">
   <!ENTITY emacs-time          "0.6 SBU (Using parallelism=4)">
 ]>
 
@@ -118,15 +118,6 @@
   <sect2 role="installation">
     <title>Installation of Emacs</title>
 
-    <para>
-      First, work around a portability bug in glibc 2.34,
-      which no longer defines SIGSTKSZ.
-    </para>
-
-<screen><userinput>sed -e '/SIGSTKSZ/ s|^.*$|static max_align_t sigsegv_stack[\
-   (64 * 1024 + sizeof (max_align_t) - 1) / sizeof (max_align_t)];|' \
-    -i src/sysdep.c</userinput></screen>
-
     <para>
       Install <application>Emacs</application> by running the following
       commands: