Index: general/genlib/libdaemon.xml
===================================================================
--- general/genlib/libdaemon.xml	(revision 1b83b0e0cf7a32c5468fe867ddd2047757efaf48)
+++ general/genlib/libdaemon.xml	(revision 79d191ee203e3f513c682daae13fab1932de5c37)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: networking/netlibs/libnl.xml
===================================================================
--- networking/netlibs/libnl.xml	(revision 1b83b0e0cf7a32c5468fe867ddd2047757efaf48)
+++ networking/netlibs/libnl.xml	(revision 79d191ee203e3f513c682daae13fab1932de5c37)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: networking/netlibs/libtirpc.xml
===================================================================
--- networking/netlibs/libtirpc.xml	(revision 1b83b0e0cf7a32c5468fe867ddd2047757efaf48)
+++ networking/netlibs/libtirpc.xml	(revision 79d191ee203e3f513c682daae13fab1932de5c37)
@@ -73,4 +73,6 @@
     </itemizedlist>
 
+    <!-- Not needed for LFS 7.5, Glibc RPC interface is exported again
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
@@ -81,5 +83,5 @@
         </para>
       </listitem>
-    </itemizedlist>
+    </itemizedlist> -->
 
     <bridgehead renderas="sect3">libtirpc Dependencies</bridgehead>
@@ -103,8 +105,8 @@
     </para>
 
-<screen><userinput>patch -Np1 -i ../libtirpc-&libtirpc-version;-remove_nis-1.patch &amp;&amp;
+<screen><userinput><!--patch -Np1 -i ../libtirpc-&libtirpc-version;-remove_nis-1.patch &amp;&amp;
 autoreconf -fi &amp;&amp;
 
-./configure --prefix=/usr     \
+-->./configure --prefix=/usr     \
             --sysconfdir=/etc \
             --disable-static  \
Index: networking/netprogs/net-tools.xml
===================================================================
--- networking/netprogs/net-tools.xml	(revision 1b83b0e0cf7a32c5468fe867ddd2047757efaf48)
+++ networking/netprogs/net-tools.xml	(revision 79d191ee203e3f513c682daae13fab1932de5c37)
@@ -34,5 +34,5 @@
     kernel.</para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: networking/netprogs/rpcbind.xml
===================================================================
--- networking/netprogs/rpcbind.xml	(revision 1b83b0e0cf7a32c5468fe867ddd2047757efaf48)
+++ networking/netprogs/rpcbind.xml	(revision 79d191ee203e3f513c682daae13fab1932de5c37)
@@ -73,9 +73,10 @@
     <title>Installation of rpcbind</title>
 
+    <!-- Packages should adopt to standards, not the other way arround -->
     <para>In order to get <application>rpcbind</application> to work
-    properly, first fix <filename>/etc/services</filename>. As the
-    <systemitem class="username">root</systemitem> user:</para>
+    properly, first fix the package to use correct service name:</para>
 
-<screen role="root"><userinput>sed -i 's/^sunrpc/rpcbind/' /etc/services</userinput></screen>
+<screen><userinput>sed -i "/servname/s:rpcbind:sunrpc:" src/rpcbind.c &amp;&amp;
+sed -i "/error = getaddrinfo/s:rpcbind:sunrpc:" src/rpcinfo.c</userinput></screen>
 
     <para>Install <application>rpcbind</application> by running the following
@@ -112,5 +113,5 @@
 
       <indexterm zone="rpcbind rpcbind-init">
-         <primary sortas="f-portmap">portmap</primary>
+         <primary sortas="f-rpcbind">rpcbind</primary>
       </indexterm>
 
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision 1b83b0e0cf7a32c5468fe867ddd2047757efaf48)
+++ networking/netprogs/samba.xml	(revision 79d191ee203e3f513c682daae13fab1932de5c37)
@@ -39,5 +39,5 @@
     among other things provides LAN browsing support).</para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -67,5 +67,4 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="libtirpc"/> and
       <xref linkend="python2"/>
     </para>
@@ -112,7 +111,5 @@
     commands:</para>
 
-<screen><userinput>sed -i -e "/dmapi_lib/s/$/ldflags='-ltirpc',/" source3/wscript_build &amp;&amp;
-
-./configure                            \
+<screen><userinput>./configure                            \
     --prefix=/usr                      \
     --sysconfdir=/etc                  \
@@ -166,16 +163,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para><command>sed ... source3/wscript_build</command>:
-    This command enables the build to complete when using libtirpc instead of
-    the deprecated glibc rpc functions.</para>
-
-    <para><parameter>--sysconfdir=/etc</parameter>: Sets the configuration
-    file directory to avoid the default of
-    <filename class="directory">/usr/etc</filename>.</para>
-
-    <para><parameter>--localstatedir=/var</parameter>: Sets the variable
-    data directory to avoid the default of
-    <filename class="directory">/usr/var</filename>.</para>
 
     <para><parameter>--enable-fhs</parameter>: Assigns all other file paths in
Index: networking/netprogs/wpa_supplicant.xml
===================================================================
--- networking/netprogs/wpa_supplicant.xml	(revision 1b83b0e0cf7a32c5468fe867ddd2047757efaf48)
+++ networking/netprogs/wpa_supplicant.xml	(revision 79d191ee203e3f513c682daae13fab1932de5c37)
@@ -41,5 +41,5 @@
     </para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: networking/netutils/avahi.xml
===================================================================
--- networking/netutils/avahi.xml	(revision 1b83b0e0cf7a32c5468fe867ddd2047757efaf48)
+++ networking/netutils/avahi.xml	(revision 79d191ee203e3f513c682daae13fab1932de5c37)
@@ -35,5 +35,5 @@
     </para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: networking/netutils/networkmanager.xml
===================================================================
--- networking/netutils/networkmanager.xml	(revision 1b83b0e0cf7a32c5468fe867ddd2047757efaf48)
+++ networking/netutils/networkmanager.xml	(revision 79d191ee203e3f513c682daae13fab1932de5c37)
@@ -40,5 +40,5 @@
     </para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: networking/netutils/wicd.xml
===================================================================
--- networking/netutils/wicd.xml	(revision 1b83b0e0cf7a32c5468fe867ddd2047757efaf48)
+++ networking/netutils/wicd.xml	(revision 79d191ee203e3f513c682daae13fab1932de5c37)
@@ -39,5 +39,5 @@
     </para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: x/lib/webkitgtk.xml
===================================================================
--- x/lib/webkitgtk.xml	(revision 1b83b0e0cf7a32c5468fe867ddd2047757efaf48)
+++ x/lib/webkitgtk.xml	(revision 79d191ee203e3f513c682daae13fab1932de5c37)
@@ -119,15 +119,4 @@
     <title>Installation of WebKitGTK+</title>
 
-    <warning>
-      <para>
-        If you are building <application>WebKitGTK+</application>
-        with <command>make</command> 3.82, make sure that you have built
-        it with the following
-        <ulink url="&patch-downloads;/make/make-3.82-upstream_fixes-3.patch">
-        patch</ulink> applied or <application>WebKitGTK+</application>
-        build will fail.
-      </para>
-    </warning>
-
     <para>
       If you have not installed <xref linkend="gtk-doc"/>, fix a bug that will
@@ -145,7 +134,5 @@
              Source/ThirdParty/ANGLE/src/compiler/glslang.y</userinput> &amp;&amp;
 <userinput>patch -Np1 -i ../webkitgtk-&webkitgtk-version;-fix_librt_linking-1.patch &amp;&amp;
-./configure --prefix=/usr \
-            --with-gtk=2.0 \
-            --disable-webkit2 &amp;&amp;
+./configure --prefix=/usr --with-gtk=2.0 --disable-webkit2 &amp;&amp;
 make</userinput></screen>
 
@@ -207,6 +194,6 @@
         </seg>
         <seg>
-          /usr/include/webkit-1.0, /usr/share/webkit-1.0 and
-          /usr/lib/webkitgtk2
+          /usr/include/webkit-1.0 and
+          /usr/share/webkit-1.0
         </seg>
       </seglistitem>
Index: xfce/apps/vte2.xml
===================================================================
--- xfce/apps/vte2.xml	(revision 1b83b0e0cf7a32c5468fe867ddd2047757efaf48)
+++ xfce/apps/vte2.xml	(revision 79d191ee203e3f513c682daae13fab1932de5c37)
@@ -101,5 +101,7 @@
     </para>
 
+<!-- both vte2 and vte3 install the same file in libexecdir, so overwrite this one -->
 <screen><userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib/vte \
             --disable-static  &amp;&amp;
 make</userinput></screen>
