Index: kde/extra-cmake-modules.xml
===================================================================
--- kde/extra-cmake-modules.xml	(revision 89f706b2a1285aed4685510caaee7c935895d11b)
+++ kde/extra-cmake-modules.xml	(revision a58166242373db152e730b9ca56a4576b0c80019)
@@ -36,5 +36,5 @@
     </para>
 
-    &lfs7a_checked;
+    &lfs80_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/kf5/kf5-frameworks.xml
===================================================================
--- kde/kf5/kf5-frameworks.xml	(revision 89f706b2a1285aed4685510caaee7c935895d11b)
+++ kde/kf5/kf5-frameworks.xml	(revision a58166242373db152e730b9ca56a4576b0c80019)
@@ -31,5 +31,5 @@
   independent of the KDE Display Environment (Plasma 5).</para>
 
-  &lfs7a_checked;
+  &lfs80_checked;
 
   <para>The instructions below build all of the KDE Frameworks packages in one
@@ -244,11 +244,11 @@
 cd4290e76d0c07a3612b82257119a4df  kactivities-stats-5.31.0.tar.xz
 6105cf1f51b69cd9232aa662f8d2511a  krunner-5.31.0.tar.xz
-71ec95ef3c79e2a86de4872bb97daa0e  kjs-5.31.0.tar.xz
-aa244aa083a03be78a976a8a8cd6ed8c  kdelibs4support-5.31.0.tar.xz
-21a3859d1358a330fbdb83f3c184dd71  khtml-5.31.0.tar.xz
-49f65f405b4e3d49adf81247efce963f  kjsembed-5.31.0.tar.xz
-f287ac1073cae07f51178ad78f30cf4b  kmediaplayer-5.31.0.tar.xz
-743b48d58b23d386e4417081a4d456cb  kross-5.31.0.tar.xz
-#95cb43eb20e081db51709b0ab6bcfa96  prison-5.31.0.tar.xz</literal>
+#95cb43eb20e081db51709b0ab6bcfa96  prison-5.31.0.tar.xz
+71ec95ef3c79e2a86de4872bb97daa0e  portingAids/kjs-5.31.0.tar.xz
+aa244aa083a03be78a976a8a8cd6ed8c  portingAids/kdelibs4support-5.31.0.tar.xz
+21a3859d1358a330fbdb83f3c184dd71  portingAids/khtml-5.31.0.tar.xz
+49f65f405b4e3d49adf81247efce963f  portingAids/kjsembed-5.31.0.tar.xz
+f287ac1073cae07f51178ad78f30cf4b  portingAids/kmediaplayer-5.31.0.tar.xz
+743b48d58b23d386e4417081a4d456cb  portingAids/kross-5.31.0.tar.xz</literal>
 EOF</userinput></screen>
 
@@ -269,8 +269,13 @@
 
     <caution>
-      <para>If inatalling in /opt and there is an existing /opt/kf5 either as a
-      regular directory or a symbolic link, it should be removed (as root):</para>
-
-      <screen><userinput>rm -rf /opt/kf5</userinput></screen>
+
+      <para>If installing in /opt and there is an existing /opt/kf5 either as a
+      regular directory or a symbolic link, it should be reinitialized (as
+      root):</para>
+
+      <screen role="root"><userinput>mv -v /opt/kf5 /opt/kf5.old                         &amp;&amp;
+install -v -dm755           $KF5_PREFIX/{etc,share} &amp;&amp;
+ln -sfv /etc/dbus-1         $KF5_PREFIX/etc         &amp;&amp;
+ln -sfv /usr/share/dbus-1   $KF5_PREFIX/share</userinput></screen>
     </caution>
 
@@ -329,5 +334,5 @@
     symlink:</para>
 
-    <screen><userinput>mv -v /opt/kf5 /opt/kf5-&kf5-version;
+    <screen role="root"><userinput>mv -v /opt/kf5 /opt/kf5-&kf5-version;
 ln -sfvn kf5-&kf5-version; /opt/kf5</userinput></screen>
 
Index: kde/libdbusmenuqt.xml
===================================================================
--- kde/libdbusmenuqt.xml	(revision 89f706b2a1285aed4685510caaee7c935895d11b)
+++ kde/libdbusmenuqt.xml	(revision a58166242373db152e730b9ca56a4576b0c80019)
@@ -33,5 +33,5 @@
     of the DBusMenu specification that exposes menus via DBus.</para>
 
-    &lfs7a_checked;
+    &lfs80_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/phonon-backend-gstreamer.xml
===================================================================
--- kde/phonon-backend-gstreamer.xml	(revision 89f706b2a1285aed4685510caaee7c935895d11b)
+++ kde/phonon-backend-gstreamer.xml	(revision a58166242373db152e730b9ca56a4576b0c80019)
@@ -34,5 +34,5 @@
     </para>
 
-    &lfs7a_checked;
+    &lfs80_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/phonon-backend-vlc.xml
===================================================================
--- kde/phonon-backend-vlc.xml	(revision 89f706b2a1285aed4685510caaee7c935895d11b)
+++ kde/phonon-backend-vlc.xml	(revision a58166242373db152e730b9ca56a4576b0c80019)
@@ -34,5 +34,5 @@
     </para>
 
-    &lfs7a_checked;
+    &lfs80_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/phonon.xml
===================================================================
--- kde/phonon.xml	(revision 89f706b2a1285aed4685510caaee7c935895d11b)
+++ kde/phonon.xml	(revision a58166242373db152e730b9ca56a4576b0c80019)
@@ -34,5 +34,5 @@
     Phonon needs either the GStreamer or VLC backend.</para>
 
-    &lfs7a_checked;
+    &lfs80_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
Index: kde/polkit-qt.xml
===================================================================
--- kde/polkit-qt.xml	(revision 89f706b2a1285aed4685510caaee7c935895d11b)
+++ kde/polkit-qt.xml	(revision a58166242373db152e730b9ca56a4576b0c80019)
@@ -33,5 +33,5 @@
     the Qt environment. </para>
 
-    &lfs7a_checked;
+    &lfs80_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
