Index: general/genlib/enchant.xml
===================================================================
--- general/genlib/enchant.xml	(revision 7aca1ba9444361e5235c8116f6df83bb89bdf8b6)
+++ general/genlib/enchant.xml	(revision f733b3ec2c9a3ae9693e972c4f91cead2a353eaa)
@@ -82,5 +82,5 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -90,4 +90,12 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
@@ -129,6 +137,7 @@
       <seglistitem>
         <seg>enchant and enchant-lsmod</seg>
-        <seg>libenchant.{so,a} and various backend libraries</seg>
-        <seg>/usr/{include/enchant,lib/enchant,share/enchant}</seg>
+        <seg>libenchant.so</seg>
+        <seg>/usr/include/enchant, /usr/lib/enchant, and
+        /usr/share/enchant</seg>
       </seglistitem>
     </segmentedlist>
@@ -160,9 +169,9 @@
 
       <varlistentry id="libenchant">
-        <term><filename class='libraryfile'>libenchant.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libenchant.so</filename></term>
         <listitem>
           <para>contains spell checking interface API functions.</para>
           <indexterm zone="enchant libenchant">
-            <primary sortas="c-libenchant">libenchant.{so,a}</primary>
+            <primary sortas="c-libenchant">libenchant.so</primary>
           </indexterm>
         </listitem>
Index: general/genlib/libesmtp.xml
===================================================================
--- general/genlib/libesmtp.xml	(revision 7aca1ba9444361e5235c8116f6df83bb89bdf8b6)
+++ general/genlib/libesmtp.xml	(revision f733b3ec2c9a3ae9693e972c4f91cead2a353eaa)
@@ -74,5 +74,5 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -82,4 +82,12 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
@@ -95,5 +103,5 @@
       <seglistitem>
         <seg>libesmtp-config</seg>
-        <seg>libesmtp.{so,a} and <application>libESMTP</application>
+        <seg>libesmtp.so and <application>libESMTP</application>
         SASL plugins</seg>
         <seg>/usr/lib/esmtp-plugins</seg>
@@ -118,10 +126,10 @@
 
       <varlistentry id="libesmtp-lib">
-        <term><filename class='libraryfile'>libesmtp.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libesmtp.so</filename></term>
         <listitem>
           <para>is used to manage submission of electronic mail to a Mail
           Transport Agent.</para>
           <indexterm zone="libesmtp libesmtp-lib">
-            <primary sortas="c-libesmtp">libesmtp.{so,a}</primary>
+            <primary sortas="c-libesmtp">libesmtp.so</primary>
           </indexterm>
         </listitem>
Index: general/genlib/libunistring.xml
===================================================================
--- general/genlib/libunistring.xml	(revision 7aca1ba9444361e5235c8116f6df83bb89bdf8b6)
+++ general/genlib/libunistring.xml	(revision f733b3ec2c9a3ae9693e972c4f91cead2a353eaa)
@@ -74,5 +74,5 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -82,4 +82,12 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
@@ -95,5 +103,5 @@
       <seglistitem>
         <seg>None</seg>
-        <seg>libunistring.{a,so}</seg>
+        <seg>libunistring.so</seg>
         <seg>/usr/share/libunistring</seg>
       </seglistitem>
@@ -106,9 +114,9 @@
 
       <varlistentry id="libunistring-lib">
-        <term><command>libunistring.{a,so}</command></term>
+        <term><command>libunistring.so</command></term>
         <listitem>
           <para>provides the unicode string library API.</para>
           <indexterm zone="libunistring libunistring-lib">
-            <primary sortas="c-libunistring-lib">libunistring.{a,so}</primary>
+            <primary sortas="c-libunistring-lib">libunistring.so</primary>
           </indexterm>
         </listitem>
Index: general/genutils/rarian.xml
===================================================================
--- general/genutils/rarian.xml	(revision 7aca1ba9444361e5235c8116f6df83bb89bdf8b6)
+++ general/genutils/rarian.xml	(revision f733b3ec2c9a3ae9693e972c4f91cead2a353eaa)
@@ -78,5 +78,7 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --localstatedir=/var &amp;&amp;
+<screen><userinput>./configure --prefix=/usr        \
+            --localstatedir=/var \
+            --disable-static     &amp;&amp;
 make</userinput></screen>
 
@@ -86,4 +88,12 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
@@ -103,5 +113,5 @@
         rarian-sk-install, rarian-sk-migrate, rarian-sk-preinstall,
         rarian-sk-rebuild, and rarian-sk-update</seg>
-        <seg>librarian.{so,a}</seg>
+        <seg>librarian.so</seg>
         <seg>/usr/include/rarian, /usr/share/help, /usr/share/librarian/manual,
         /usr/share/librarian/Templates/C, and /usr/var/lib/rarian</seg>
@@ -262,10 +272,10 @@
 
       <varlistentry id="librarian">
-        <term><filename class='libraryfile'>librarian.{so,a}</filename></term>
+        <term><filename class='libraryfile'>librarian.so</filename></term>
         <listitem>
           <para>is the API to build a list of available meta data files and
           allows access to these.</para>
           <indexterm zone="rarian librarian">
-            <primary sortas="c-librarian">librarian.{so,a}</primary>
+            <primary sortas="c-librarian">librarian.so</primary>
           </indexterm>
         </listitem>
Index: gnome-systemd/platform/tracker.xml
===================================================================
--- gnome-systemd/platform/tracker.xml	(revision 7aca1ba9444361e5235c8116f6df83bb89bdf8b6)
+++ gnome-systemd/platform/tracker.xml	(revision f733b3ec2c9a3ae9693e972c4f91cead2a353eaa)
@@ -140,4 +140,5 @@
 <screen><userinput>./configure --prefix=/usr             \
             --sysconfdir=/etc         \
+            --disable-static          \
             --disable-unit-tests      \
             --disable-miner-evolution \
@@ -160,4 +161,7 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
     <para>
Index: multimedia/libdriv/gst-plugins-bad.xml
===================================================================
--- multimedia/libdriv/gst-plugins-bad.xml	(revision 7aca1ba9444361e5235c8116f6df83bb89bdf8b6)
+++ multimedia/libdriv/gst-plugins-bad.xml	(revision f733b3ec2c9a3ae9693e972c4f91cead2a353eaa)
@@ -159,7 +159,8 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --with-gtk=3.0 \
+<screen><userinput>./configure --prefix=/usr      \
+            --with-gtk=3.0     \
             --disable-examples \
+            --disable-static   \
             --with-package-name="GStreamer Bad Plugins &gst-plugins-bad-version; BLFS" \
             --with-package-origin="http://www.linuxfromscratch.org/blfs/view/&blfs-version;/" &amp;&amp;
Index: multimedia/libdriv/gst-plugins-base-systemd.xml
===================================================================
--- multimedia/libdriv/gst-plugins-base-systemd.xml	(revision 7aca1ba9444361e5235c8116f6df83bb89bdf8b6)
+++ multimedia/libdriv/gst-plugins-base-systemd.xml	(revision f733b3ec2c9a3ae9693e972c4f91cead2a353eaa)
@@ -153,8 +153,8 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>./configure --prefix=/usr    \
+            --disable-static \
             --with-package-name="GStreamer Base Plugins &gst-plugins-base-version; BLFS" \
-            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/&blfs-version;/" \
-            --disable-static &amp;&amp;
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/&blfs-version;/" &amp;&amp;
 make</userinput></screen>
 
Index: multimedia/libdriv/gstreamer.xml
===================================================================
--- multimedia/libdriv/gstreamer.xml	(revision 7aca1ba9444361e5235c8116f6df83bb89bdf8b6)
+++ multimedia/libdriv/gstreamer.xml	(revision f733b3ec2c9a3ae9693e972c4f91cead2a353eaa)
@@ -134,8 +134,8 @@
             gst/parse/grammar.y &amp;&amp;
 
-./configure --prefix=/usr \
+./configure --prefix=/usr    \
+            --disable-static \
             --with-package-name="GStreamer &gstreamer-version; BLFS" \
-            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/&blfs-version;/" \
-            --disable-static &amp;&amp;
+            --with-package-origin="http://www.linuxfromscratch.org/blfs/view/&blfs-version;/" &amp;&amp;
 make</userinput></screen>
 
Index: multimedia/libdriv/libmpeg2.xml
===================================================================
--- multimedia/libdriv/libmpeg2.xml	(revision 7aca1ba9444361e5235c8116f6df83bb89bdf8b6)
+++ multimedia/libdriv/libmpeg2.xml	(revision f733b3ec2c9a3ae9693e972c4f91cead2a353eaa)
@@ -79,5 +79,5 @@
 
 <screen><userinput>sed -i 's/static const/static/' libmpeg2/idct_mmx.c &amp;&amp;
-./configure --prefix=/usr                           &amp;&amp;
+./configure --prefix=/usr --disable-static          &amp;&amp;
 make</userinput></screen>
 
@@ -100,4 +100,8 @@
     <para><command>sed -i ...</command>: This <command>sed</command> fixes
     problems with recent GCC compilers.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
   </sect2>
 
@@ -144,9 +148,9 @@
 
       <varlistentry id="libmpeg2-lib">
-        <term><filename class='libraryfile'>libmpeg2.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libmpeg2.so</filename></term>
         <listitem>
           <para>contains API functions used to decode MPEG video streams.</para>
           <indexterm zone="libmpeg2 libmpeg2-lib">
-            <primary sortas="c-libmpeg2">libmpeg2.{so,a}</primary>
+            <primary sortas="c-libmpeg2">libmpeg2.so</primary>
           </indexterm>
         </listitem>
@@ -159,5 +163,5 @@
           video streams.</para>
           <indexterm zone="libmpeg2 libmpeg2convert">
-            <primary sortas="c-libmpeg2convert">libmpeg2convert.{so,a}</primary>
+            <primary sortas="c-libmpeg2convert">libmpeg2convert.so</primary>
           </indexterm>
         </listitem>
Index: multimedia/libdriv/libmusicbrainz.xml
===================================================================
--- multimedia/libdriv/libmusicbrainz.xml	(revision 7aca1ba9444361e5235c8116f6df83bb89bdf8b6)
+++ multimedia/libdriv/libmusicbrainz.xml	(revision f733b3ec2c9a3ae9693e972c4f91cead2a353eaa)
@@ -93,5 +93,5 @@
 
 <screen><userinput>patch -Np1 -i ../libmusicbrainz-&libmusicbrainz-version;-missing-includes-1.patch &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
+./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -122,4 +122,12 @@
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
@@ -132,5 +140,5 @@
       <seglistitem>
         <seg>None</seg>
-        <seg>libmusicbrainz.{so,a}</seg>
+        <seg>libmusicbrainz.so</seg>
         <seg>/usr/include/musicbrainz and
         /usr/share/doc/libmusicbrainz-&libmusicbrainz-version;</seg>
@@ -144,10 +152,10 @@
 
       <varlistentry id="libmusicbrainz-lib">
-        <term><filename class='libraryfile'>libmusicbrainz.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libmusicbrainz.so</filename></term>
         <listitem>
           <para>contains API functions to access the MusicBrainz database, both
           for looking up data and also for submitting new data.</para>
           <indexterm zone="libmusicbrainz libmusicbrainz-lib">
-            <primary sortas="c-libmusicbrainz">libmusicbrainz.{so,a}</primary>
+            <primary sortas="c-libmusicbrainz">libmusicbrainz.so</primary>
           </indexterm>
         </listitem>
Index: x/lib/fltk.xml
===================================================================
--- x/lib/fltk.xml	(revision 7aca1ba9444361e5235c8116f6df83bb89bdf8b6)
+++ x/lib/fltk.xml	(revision f733b3ec2c9a3ae9693e972c4f91cead2a353eaa)
@@ -136,5 +136,6 @@
             --enable-threads \
             --enable-xft     \
-            --enable-shared  &amp;&amp;
+            --enable-shared  \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -167,14 +168,4 @@
 
     <para>
-      <command>patch ...tigervnc-1.patch</command>: Install patches to make
-      the libraries compatible with <application>tigervnc</application>.
-    </para>
-
-    <para>
-      <command>patch ...dynamic_libs-1.patch</command>: Allow building
-      dynamic libraries.
-    </para>
-
-    <para>
       <command>sed ... configure</command>: configure: Fix output of
       <command>fltk-config --version</command>.
@@ -183,6 +174,9 @@
     <para>
       <command>sed ... documentation/Makefile</command>: Avoid installing
-      pages in <filename class='directory'>/usr/share/man/cat*</filename>.
-    </para>
+      pages in <filename class="directory">/usr/share/man/cat*</filename>.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
@@ -205,8 +199,8 @@
         </seg>
         <seg>
-          libfltk.{a,so}, 
-          libfltk_forms.{a,so}, 
-          libfltk_gl.{a,so}, and 
-          libfltk_images.{a,so}
+          libfltk.so,
+          libfltk_forms.so,
+          libfltk_gl.so, and 
+          libfltk_images.so
         </seg>
         <seg>
