Index: kde/core/core.xml
===================================================================
--- kde/core/core.xml	(revision 93b1f8d623ff973d4417deb725b7b6eaaa78243d)
+++ kde/core/core.xml	(revision ed5568ef099831569fa3744fe3e0c01b49cc9adc)
@@ -28,6 +28,6 @@
   <!--
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-qt.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="oxygen-icons.xml"/>
   -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="oxygen-icons.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdelibs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kfilemetadata.xml"/>
Index: kde/core/oxygen-icons.xml
===================================================================
--- kde/core/oxygen-icons.xml	(revision 93b1f8d623ff973d4417deb725b7b6eaaa78243d)
+++ 	(revision )
@@ -1,112 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY oxygen-icons-download-http "&kde-download-http;applications/&oxygen-icons-version;/src/oxygen-icons-&oxygen-icons-version;.tar.xz">
-  <!ENTITY oxygen-icons-download-ftp  " ">
-  <!ENTITY oxygen-icons-md5sum        "4f24f975fb90d8daab833fc719ce39a3">
-  <!ENTITY oxygen-icons-size          "219 MB">
-  <!ENTITY oxygen-icons-buildsize     "474 MB">
-  <!ENTITY oxygen-icons-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="oxygen-icons" xreflabel="oxygen-icons-&oxygen-icons-version;">
-  <?dbhtml filename="oxygen-icons.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Oxygen-icons-&oxygen-icons-version;</title>
-
-  <indexterm zone="oxygen-icons">
-    <primary sortas="a-oxygen-icons">oxygen-icons</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Oxygen-icons</title>
-
-    <para>The Oxygen theme is a photo-realistic icon style, with a
-    high standard of graphics quality.</para>
-
-    &lfs78_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&oxygen-icons-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&oxygen-icons-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &oxygen-icons-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &oxygen-icons-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &oxygen-icons-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &oxygen-icons-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Oxygen-icons Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="cmake"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/oxygen-icons"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Oxygen-icons</title>
-
-    <para>Install <application>Oxygen-icons</application> by running
-    the following commands:</para>
-
-    <note><para>Unlike most packages in this section, the icons are placed
-    in /usr so other applications can find them.</para></note>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev ..</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>none</seg>
-        <seg>none</seg>
-        <seg>&kde-dir;/share/icons/oxygen</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: kde/kf5/kf5-frameworks.xml
===================================================================
--- kde/kf5/kf5-frameworks.xml	(revision 93b1f8d623ff973d4417deb725b7b6eaaa78243d)
+++ kde/kf5/kf5-frameworks.xml	(revision ed5568ef099831569fa3744fe3e0c01b49cc9adc)
@@ -96,5 +96,6 @@
   <bridgehead renderas="sect4">Runtime dependency for FrameworkIntegration</bridgehead>
   <para role="optional">
-    <ulink url="http://download.kde.org/stable/plasma/5.2.0">oxygen-fonts</ulink>
+    <ulink url="http://download.kde.org/stable/plasma/&plasma5-version;">oxygen-fonts</ulink> 
+    (also available in <xref linkend="plasma5-build"/>)
   </para>
 
@@ -242,6 +243,7 @@
   a hash (#) character. The extra-cmake-modules entry has been commented out
   because it was built earlier in the <xref linkend="kde-prereq"/>. The icon
-  packages are covered separately at "TBD".  The modemmanager-qt package
-  may be built if its optional dependency has been installed.</para>
+  packages are covered separately at <xref linkend="breeze-icons"/> and <xref
+  linkend="oxygen-icons5"/>.  The modemmanager-qt package may be built if its
+  optional dependency has been installed.</para>
 
   </sect2>
