diff --git a/general/sysutils/systemd.xml b/general/sysutils/systemd.xml
index 83d4cc07fe..3aa22749d3 100644
--- a/general/sysutils/systemd.xml
+++ b/general/sysutils/systemd.xml
@@ -173,8 +173,8 @@ cd    build &&
 meson --prefix=/usr                 \
       --sysconfdir=/etc             \
       --localstatedir=/var          \
+      --buildtype=release           \
       -Dblkid=true                  \
-      -Dbuildtype=release           \
       -Ddefault-dnssec=no           \
       -Dfirstboot=false             \
       -Dinstall-tests=false         \
@@ -252,6 +252,9 @@ ninja</userinput></screen>
     </para>
 -->
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/meson-buildtype-release.xml"/>
+
     <para>
       <parameter>-Dpamconfdir=/etc/pam.d</parameter>: Forces the PAM files to
       be installed in /etc/pam.d rather than /usr/lib/pam.d.
diff --git a/gnome/platform/libwnck.xml b/gnome/platform/libwnck.xml
index 806d01ee81..655d7e36df 100644
--- a/gnome/platform/libwnck.xml
+++ b/gnome/platform/libwnck.xml
@@ -103,7 +103,7 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
-meson --prefix=/usr -Dbuildtype=release .. &amp;&amp;
+meson --prefix=/usr --buildtype=release .. &amp;&amp;
 ninja</userinput></screen>
 
     <para>
@@ -121,6 +121,9 @@ ninja</userinput></screen>
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/meson-buildtype-release.xml"/>
+
     <para>
       <option>-Dgtk_doc=true</option>: Use this option
       to build the API reference manual.
diff --git a/multimedia/libdriv/gst10-libav.xml b/multimedia/libdriv/gst10-libav.xml
index b6a8bfb31b..ba1b7ca2ba 100644
--- a/multimedia/libdriv/gst10-libav.xml
+++ b/multimedia/libdriv/gst10-libav.xml
@@ -112,7 +112,7 @@
 cd    build &amp;&amp;
 
 meson  --prefix=/usr       \
-       -Dbuildtype=release \
+       --buildtype=release \
        -Dpackage-origin=https://www.linuxfromscratch.org/blfs/view/svn/ \
        -Dpackage-name="GStreamer &gst10-libav-version; BLFS" &amp;&amp;
 ninja</userinput></screen>
@@ -129,17 +129,12 @@ ninja</userinput></screen>
 <screen role="root"><userinput>ninja install</userinput></screen>
   </sect2>
 
-  <!-- No longer included with Meson change
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para>
-      <option>- -with-libav-extra-configure="- -disable-yasm"</option>: Use this
-      switch if you don't have <application>yasm</application> installed.
-    </para>
-
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/meson-buildtype-release.xml"/>
   </sect2>
-  -->
 
   <sect2 role="content">
     <title>Contents</title>
diff --git a/multimedia/libdriv/gst10-plugins-bad.xml b/multimedia/libdriv/gst10-plugins-bad.xml
index b522f3104e..12157f1fe2 100644
--- a/multimedia/libdriv/gst10-plugins-bad.xml
+++ b/multimedia/libdriv/gst10-plugins-bad.xml
@@ -193,7 +193,7 @@
 cd    build &amp;&amp;
 
 meson  --prefix=/usr       \
-       -Dbuildtype=release \
+       --buildtype=release \
        -Dpackage-origin=https://www.linuxfromscratch.org/blfs/view/svn/ \
        -Dpackage-name="GStreamer &gst10-plugins-bad-version; BLFS" &amp;&amp;
 ninja</userinput></screen>
@@ -210,6 +210,13 @@ ninja</userinput></screen>
 <screen role="root"><userinput>ninja install</userinput></screen>
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/meson-buildtype-release.xml"/>
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
 
diff --git a/multimedia/libdriv/gst10-plugins-base.xml b/multimedia/libdriv/gst10-plugins-base.xml
index a97b1534f2..7438e5b2cf 100644
--- a/multimedia/libdriv/gst10-plugins-base.xml
+++ b/multimedia/libdriv/gst10-plugins-base.xml
@@ -145,7 +145,7 @@
 cd    build &amp;&amp;
 
 meson  --prefix=/usr       \
-       -Dbuildtype=release \
+       --buildtype=release \
        -Dpackage-origin=https://www.linuxfromscratch.org/blfs/view/svn/ \
        -Dpackage-name="GStreamer &gst10-plugins-base-version; BLFS"    \
        --wrap-mode=nodownload &amp;&amp;
@@ -178,8 +178,12 @@ ninja</userinput></screen>
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/meson-buildtype-release.xml"/>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/meson-wrap-nodownload.xml"/>
+
   </sect2>
 
   <sect2 role="content">
diff --git a/multimedia/libdriv/gst10-plugins-good.xml b/multimedia/libdriv/gst10-plugins-good.xml
index d573482bcd..df27cd40cb 100644
--- a/multimedia/libdriv/gst10-plugins-good.xml
+++ b/multimedia/libdriv/gst10-plugins-good.xml
@@ -163,7 +163,7 @@ mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
 meson  --prefix=/usr       \
-       -Dbuildtype=release \
+       --buildtype=release \
        -Dpackage-origin=https://www.linuxfromscratch.org/blfs/view/svn/ \
        -Dpackage-name="GStreamer &gst10-plugins-good-version; BLFS" &amp;&amp;
 ninja</userinput></screen>
@@ -180,6 +180,13 @@ ninja</userinput></screen>
 <screen role="root"><userinput>ninja install</userinput></screen>
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/meson-buildtype-release.xml"/>
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
 
diff --git a/multimedia/libdriv/gst10-plugins-ugly.xml b/multimedia/libdriv/gst10-plugins-ugly.xml
index dc342d3163..2c24640341 100644
--- a/multimedia/libdriv/gst10-plugins-ugly.xml
+++ b/multimedia/libdriv/gst10-plugins-ugly.xml
@@ -126,7 +126,7 @@
 cd    build &amp;&amp;
 
 meson  --prefix=/usr       \
-       -Dbuildtype=release \
+       --buildtype=release \
        -Dpackage-origin=https://www.linuxfromscratch.org/blfs/view/svn/ \
        -Dpackage-name="GStreamer &gst10-plugins-good-version; BLFS" &amp;&amp;
 ninja</userinput></screen>
@@ -142,6 +142,13 @@ ninja</userinput></screen>
 <screen role="root"><userinput>ninja install</userinput></screen>
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/meson-buildtype-release.xml"/>
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
 
diff --git a/multimedia/libdriv/gstreamer10-vaapi.xml b/multimedia/libdriv/gstreamer10-vaapi.xml
index e7829930b1..865775f134 100644
--- a/multimedia/libdriv/gstreamer10-vaapi.xml
+++ b/multimedia/libdriv/gstreamer10-vaapi.xml
@@ -107,7 +107,7 @@
 cd    build &amp;&amp;
 
 meson  --prefix=/usr       \
-       -Dbuildtype=release \
+       --buildtype=release \
        -Dpackage-origin=https://www.linuxfromscratch.org/blfs/view/svn/ &amp;&amp;
 ninja</userinput></screen>
 
@@ -123,6 +123,13 @@ ninja</userinput></screen>
 <screen role="root"><userinput>ninja install</userinput></screen>
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/meson-buildtype-release.xml"/>
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
 
diff --git a/multimedia/libdriv/gstreamer10.xml b/multimedia/libdriv/gstreamer10.xml
index e26009ae2b..58a7c73776 100644
--- a/multimedia/libdriv/gstreamer10.xml
+++ b/multimedia/libdriv/gstreamer10.xml
@@ -129,7 +129,7 @@
 cd    build &amp;&amp;
 
 meson  --prefix=/usr       \
-       -Dbuildtype=release \
+       --buildtype=release \
        -Dgst_debug=false   \
        -Dpackage-origin=https://www.linuxfromscratch.org/blfs/view/svn/ \
        -Dpackage-name="GStreamer &gstreamer10-version; BLFS" &amp;&amp;
@@ -159,6 +159,13 @@ ninja</userinput></screen>
 
   </sect2>
 
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/meson-buildtype-release.xml"/>
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
 
diff --git a/postlfs/editors/gedit.xml b/postlfs/editors/gedit.xml
index 7d0451a438..e56b10d774 100644
--- a/postlfs/editors/gedit.xml
+++ b/postlfs/editors/gedit.xml
@@ -113,7 +113,7 @@
 <screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
-meson --prefix=/usr -Dbuildtype=release .. &amp;&amp;
+meson --prefix=/usr --buildtype=release .. &amp;&amp;
 ninja</userinput></screen>
 
     <para>
@@ -134,6 +134,9 @@ ninja</userinput></screen>
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/meson-buildtype-release.xml"/>
+
     <para>
       <parameter>-Duser_documentation=false</parameter>: This switch disables
       generating the user documentation. Omit this switch if you have
diff --git a/postlfs/security/p11-kit.xml b/postlfs/security/p11-kit.xml
index 32732a33c9..cf69568875 100644
--- a/postlfs/security/p11-kit.xml
+++ b/postlfs/security/p11-kit.xml
@@ -137,11 +137,8 @@ ln -sfv /usr/libexec/p11-kit/trust-extract-compat \
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para>
-      <parameter>--buildtype=release</parameter>: Override the default
-      buildtype (<quote>debug</quote>), which would produce unoptimized
-      binaries.
-    </para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/meson-buildtype-release.xml"/>
 
     <para>
       <parameter>-Dtrust_paths=/etc/pki/anchors</parameter>: this switch
diff --git a/x/installing/mesa.xml b/x/installing/mesa.xml
index f9fcf512b4..c285cd4c27 100644
--- a/x/installing/mesa.xml
+++ b/x/installing/mesa.xml
@@ -230,7 +230,7 @@ DRI_DRIVERS="i965,nouveau"</userinput></screen>
 cd    build &amp;&amp;
 
 meson --prefix=$XORG_PREFIX          \
-      -Dbuildtype=release            \
+      --buildtype=release            \
       -Ddri-drivers=$DRI_DRIVERS     \
       -Dgallium-drivers=$GALLIUM_DRV \
       -Dgallium-nine=false           \
@@ -274,7 +274,7 @@ cp -rfv ../docs/* /usr/share/doc/mesa-&mesa-version;</userinput></screen>
     <title>Command Explanations</title>
 
     <para>
-      <parameter>-Dbuildtype=release</parameter>: This switch ensures a
+      <parameter>--buildtype=release</parameter>: This switch ensures a
       fully-optimized build, and disables debug assertions which will
       severely slow down the libraries in certain use-cases. Without this
       switch, build sizes can span into the 2GB range.