Index: archive/perl-error.xml
===================================================================
--- archive/perl-error.xml	(revision 2e250ed58e9b673dab1fb21cfcda8a80654733bb)
+++ archive/perl-error.xml	(revision 2e250ed58e9b673dab1fb21cfcda8a80654733bb)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY my-download-http "&perl_authors;/id/S/SH/SHLOMIF/Error-&Error-version;.tar.gz">
+  <!ENTITY my-md5sum "0dcd94640f617df02b6d6c1e4e92018c">
+
+]>
+
+  <!-- Begin Error -->
+  <sect2 id="perl-error" xreflabel="Error-&Error-version;">
+
+    <title>Error-&Error-version;</title>
+
+    <indexterm zone="perl-error">
+      <primary sortas="a-Error">Error</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Error</title>
+
+      <para>
+        The Error module provides Error/exception handling in an
+        object-oriented way.
+      </para>
+
+      &lfs83_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&my-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &my-md5sum;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Error</title>
+
+<!-- Any specific action for the module (patches, etc) should come first -->
+<!-- If the module uses standard installation instructions: -->
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+                  href="../../../xincludes/perl-standard-install.xml"/>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision 5b5575b10bfdaca663f7caefd42a1f0a1b243f1a)
+++ general/prog/git.xml	(revision 2e250ed58e9b673dab1fb21cfcda8a80654733bb)
@@ -109,6 +109,6 @@
     <para role="recommended">
       <xref linkend="curl"/> (needed to use <application>Git</application> over http,
-      https, ftp or ftps),
-      <xref linkend="perl-error"/>, and
+      https, ftp or ftps), and
+      <!-- <xref linkend="perl-error"/>, and -->
       <xref linkend="python2"/>
     </para>
Index: general/prog/perl-modules.xml
===================================================================
--- general/prog/perl-modules.xml	(revision 5b5575b10bfdaca663f7caefd42a1f0a1b243f1a)
+++ general/prog/perl-modules.xml	(revision 2e250ed58e9b673dab1fb21cfcda8a80654733bb)
@@ -167,9 +167,9 @@
         </para>
       </listitem>
-      <listitem>
+      <!--<listitem>
         <para>
           <xref linkend="perl-error"/>
         </para>
-      </listitem>
+      </listitem>-->
       <listitem>
         <para>
@@ -373,8 +373,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="perl-modules/perl-encode-jis2k.xml"/>
-
+<!--
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="perl-modules/perl-error.xml"/>
-
+-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="perl-modules/perl-file-slurper.xml"/>
Index: neral/prog/perl-modules/perl-error.xml
===================================================================
--- general/prog/perl-modules/perl-error.xml	(revision 5b5575b10bfdaca663f7caefd42a1f0a1b243f1a)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../../general.ent">
-  %general-entities;
-
-  <!ENTITY my-download-http "&perl_authors;/id/S/SH/SHLOMIF/Error-&Error-version;.tar.gz">
-  <!ENTITY my-md5sum "0dcd94640f617df02b6d6c1e4e92018c">
-
-]>
-
-  <!-- Begin Error -->
-  <sect2 id="perl-error" xreflabel="Error-&Error-version;">
-
-    <title>Error-&Error-version;</title>
-
-    <indexterm zone="perl-error">
-      <primary sortas="a-Error">Error</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Error</title>
-
-      <para>
-        The Error module provides Error/exception handling in an
-        object-oriented way.
-      </para>
-
-      &lfs83_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&my-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &my-md5sum;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Error</title>
-
-<!-- Any specific action for the module (patches, etc) should come first -->
-<!-- If the module uses standard installation instructions: -->
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-                  href="../../../xincludes/perl-standard-install.xml"/>
-
-    </sect3>
-
-  </sect2>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 5b5575b10bfdaca663f7caefd42a1f0a1b243f1a)
+++ introduction/welcome/changelog.xml	(revision 2e250ed58e9b673dab1fb21cfcda8a80654733bb)
@@ -46,4 +46,13 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Archive perl-error. Fixes
+          <ulink url="&blfs-ticket-root;11246">#11246</ulink> and
+          <ulink url="&blfs-ticket-root;11295">#11295</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to whois-5.4.0. Fixes
+          <ulink url="&blfs-ticket-root;11290">#11290</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to pixman-0.36.0. Fixes
           <ulink url="&blfs-ticket-root;11372">#11372</ulink>.</para>
Index: networking/netutils/whois.xml
===================================================================
--- networking/netutils/whois.xml	(revision 5b5575b10bfdaca663f7caefd42a1f0a1b243f1a)
+++ networking/netutils/whois.xml	(revision 2e250ed58e9b673dab1fb21cfcda8a80654733bb)
@@ -7,5 +7,5 @@
   <!ENTITY whois-download-http "https://github.com/rfc1036/whois/archive/v&whois-version;/whois-&whois-version;.tar.gz">
   <!ENTITY whois-download-ftp  " ">
-  <!ENTITY whois-md5sum        "8a9ba852c5210b079b0058d95c73d345">
+  <!ENTITY whois-md5sum        "9352e03ef686ec08259309230a3a65fc">
   <!ENTITY whois-size          "100 KB">
   <!ENTITY whois-buildsize     "1.2 MB">
Index: packages.ent
===================================================================
--- packages.ent	(revision 5b5575b10bfdaca663f7caefd42a1f0a1b243f1a)
+++ packages.ent	(revision 2e250ed58e9b673dab1fb21cfcda8a80654733bb)
@@ -566,5 +566,5 @@
 <!ENTITY nmap-version                 "7.70">
 <!ENTITY traceroute-version           "2.1.0">
-<!ENTITY whois-version                "5.2.20">
+<!ENTITY whois-version                "5.4.0">
 <!ENTITY wicd-version                 "1.7.4">
 <!ENTITY wireshark-version            "2.6.4">  <!-- even minors only -->
