diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 54688ae7bd..deb1a4fb18 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,10 @@
     <listitem>
       <para>April 10th, 2017</para>
       <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to wireshark-2.2.5. Fixes
+          <ulink url="&blfs-ticket-root;9105">#9105</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to nghttp2-1.21.1. Fixes
           <ulink url="&blfs-ticket-root;9106">#9106</ulink>.</para>
diff --git a/networking/netutils/wireshark.xml b/networking/netutils/wireshark.xml
index c509cf8d96..3aef9d0acb 100644
--- a/networking/netutils/wireshark.xml
+++ b/networking/netutils/wireshark.xml
@@ -5,10 +5,10 @@
   %general-entities;
 
   <!ENTITY wireshark-download-http "https://www.wireshark.org/download/src/all-versions/wireshark-&wireshark-version;.tar.bz2">
-  <!ENTITY wireshark-download-ftp  "ftp://ftp.uni-kl.de/pub/wireshark/src/wireshark-&wireshark-version;.tar.bz2">
-  <!ENTITY wireshark-md5sum        "49a1023a69ac108ca089d750eee50e37">
+  <!ENTITY wireshark-download-ftp  " ">
+  <!ENTITY wireshark-md5sum        "749e7ca7606ae7df5c1ca8c62f93ff31">
   <!ENTITY wireshark-size          "31 MB">
-  <!ENTITY wireshark-buildsize     "1.6 GB, with default GUI front-ends">
+  <!ENTITY wireshark-buildsize     "1.8 GB, with default GUI front-ends, and SBC codec">
   <!ENTITY wireshark-time          "11 SBU, with default GUI front-ends">
 ]>
 
@@ -331,13 +331,13 @@ chmod -v 6550 /usr/bin/{tshark,dumpcap}</userinput></screen>
 
       <seglistitem>
         <seg>
-          androiddump, capinfos, captype, dftest, dumpcap, editcap, idl2wrs,
+          capinfos, captype, dftest, dumpcap, editcap, idl2wrs,
           mergecap, randpkt, rawshark, reordercap, text2pcap, tshark, wireshark,
           and wireshark-gtk
         </seg>
         <seg>
-          libwireshark.so, libwiretap.so, libwsutil.so, and numerous modules
-          under /usr/lib/wireshark/plugins
+          libwireshark.so, libwiretap.so, libwscodecs.so (optional),
+          libwsutil.so, and numerous modules under /usr/lib/wireshark/plugins
         </seg>
         <seg>
           /usr/{lib,share}/wireshark and
diff --git a/packages.ent b/packages.ent
index 9bdc808c9b..6069e42ee8 100644
--- a/packages.ent
+++ b/packages.ent
@@ -421,7 +421,7 @@
 <!ENTITY traceroute-version           "2.1.0">
 <!ENTITY whois-version                "5.2.15">
 <!ENTITY wicd-version                 "1.7.4">
-<!ENTITY wireshark-version            "2.2.1">  <!-- even minors only -->
+<!ENTITY wireshark-version            "2.2.5">  <!-- even minors only -->
 
 <!ENTITY wicd-major-version           "1.7">