diff --git a/xml/book_administration.xml b/xml/book_administration.xml
index 5e37af934b..5cb1e2d739 100644
--- a/xml/book_administration.xml
+++ b/xml/book_administration.xml
@@ -43,9 +43,8 @@
   <xi:include href="adm_sudo.xml"/>
   <xi:include href="yast2_gui.xml"/>
   <xi:include href="yast2_ncurses.xml"/>
-  <xi:include href="yast2_userman.xml"/>
   <xi:include href="yast2_lang.xml"/>
-  <xi:include href="yast2_hw.xml"/>
+  <xi:include href="yast2_userman.xml"/>
   <xi:include href="yast2_you.xml"/>
   <xi:include href="yast2_sw.xml"/>
   <xi:include href="sw_managing_commandline.xml"/>
@@ -83,18 +82,17 @@
   <xi:include href="udev.xml"/>
   <xi:include href="suse_linux.xml"/>
   <xi:include href="nm.xml"/>
-  <xi:include href="powermanagement.xml"/>
-<!-- FIXME cwickert 2018-10-26: A single chapter doesn't justify a part of
- it's own. However, we might want to have a 'Hardware' part once we have
- more content. For now, the part is commented out.
--->
- <!-- </part> -->
+ </part>
  <!-- ===================================================================== -->
  <!-- Part: Hardware Configuration                                          -->
  <!-- ===================================================================== -->
- <!-- <part xml:id="part-hardware">
-  <title>Hardware configuration</title> -->
-  <xi:include href="hardware_vm_guest.xml"/>
+ <part xml:id="part-hardware">
+  <title>Hardware configuration</title>
+  <xi:include href="yast2_keymouse.xml"/>
+  <xi:include href="yast2_sound.xml"/>
+  <xi:include href="yast2_printer.xml"/>
+  <xi:include os="sled;osuse" href="yast2_scanner.xml"/>
+  <xi:include href="powermanagement.xml"/>
   <xi:include href="hardware_nvdimm.xml"/>
  </part>
 <!-- ===================================================================== -->
diff --git a/xml/book_startup-opensuse.xml b/xml/book_startup-opensuse.xml
index 15bda9c966..405f778f22 100644
--- a/xml/book_startup-opensuse.xml
+++ b/xml/book_startup-opensuse.xml
@@ -38,7 +38,6 @@
   <title>Administration</title>
   <xi:include href="yast2_userman.xml"/>
   <xi:include href="yast2_lang.xml"/>
-  <xi:include href="yast2_hw.xml"/>
   <xi:include href="printing.xml"/>
   <xi:include href="fuse.xml"/>
  </part>
@@ -60,6 +59,17 @@
   <xi:include href="newbie_bash.xml"/>
   <xi:include href="adm_shell.xml"/>
  </part>
+ <!-- ===================================================================== -->
+ <!-- Part: Hardware Configuration                                          -->
+ <!-- ===================================================================== -->
+ <part xml:id="part-hardware">
+  <title>Hardware configuration</title>
+  <xi:include href="yast2_keymouse.xml"/>
+  <xi:include href="yast2_sound.xml"/>
+  <xi:include href="yast2_printer.xml"/>
+  <xi:include os="sled;osuse" href="yast2_scanner.xml"/>
+  <xi:include href="hardware_nvdimm.xml"/>
+ </part>
 <!-- ===================================================================== -->
 <!-- Part: Help and Troubleshooting                                        -->
 <!-- ===================================================================== -->
diff --git a/xml/hardware_vm_guest.xml b/xml/hardware_vm_guest.xml
deleted file mode 100644
index 0921b91f6e..0000000000
--- a/xml/hardware_vm_guest.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter
-[
-  <!ENTITY % entities SYSTEM "generic-entities.ent">
-    %entities;
-]>
-
-<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="cha-vm-guest">
- <title>VM guest</title>
- <info>
-  <abstract>
-   <para>
-    This chapter contains additional information on when &productname; is
-    used in a virtual machine.
-   </para>
-  </abstract>
-  <dm:docmanager xmlns:dm="urn:x-suse:ns:docmanager">
-   <dm:bugtracker/>
-   <dm:translation>yes</dm:translation>
-  </dm:docmanager>
- </info>
- <sect1 xml:id="sec-vm-guest-vcpu">
-  <title>Adding and removing CPUs</title>
-  <para>
-   Some virtualization environments allow adding or removing CPUs while
-   the virtual machine is running.
-  </para>
-  <para>
-   For safe removal of CPUs, first deactivate them by executing
-  </para>
-  <screen>&prompt.root;<command>echo 0 > /sys/devices/system/cpu/cpu<replaceable>X</replaceable>/online</command></screen>
-  <para>
-   Replace <replaceable>X</replaceable> with the CPU number. To bring a
-   CPU back online, execute
-  </para>
-  <screen>&prompt.root;<command>echo 1 > /sys/devices/system/cpu/cpu<replaceable>X</replaceable>/online</command></screen>
- </sect1>
-</chapter>
diff --git a/xml/yast2_hw.xml b/xml/yast2_hw.xml
deleted file mode 100644
index 87b3d6ee47..0000000000
--- a/xml/yast2_hw.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter
-[
-  <!ENTITY % entities SYSTEM "generic-entities.ent">
-    %entities;
-]>
-
-<chapter version="5.0" xml:id="cha-yast-hw"
-  xmlns="http://docbook.org/ns/docbook"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  xmlns:xlink="http://www.w3.org/1999/xlink">
- <title>Setting up hardware components with &yast;</title>
- <info>
-  <abstract>
-   <para>
-    &yast; allows you to configure hardware items such as audio hardware, your
-    system keyboard layout or printers.
-   </para>
-  </abstract>
-  <dm:docmanager xmlns:dm="urn:x-suse:ns:docmanager">
-   <dm:bugtracker></dm:bugtracker>
-   <dm:translation>yes</dm:translation>
-  </dm:docmanager>
- </info>
- <note>
-  <title>Graphics card, monitor, mouse and keyboard settings</title>
-  <para>
-   Graphics card, monitor, mouse and keyboard can be configured with &gnome;
-   tools. <phrase os="sled;osuse">See
-   <xref linkend="cha-gnome-settings"/> for details.</phrase>
-  </para>
- </note>
- <xi:include href="yast2_keymouse.xml"/>
- <xi:include href="yast2_sound.xml"/>
- <xi:include href="yast2_printer.xml"/>
- <xi:include os="sled;osuse" href="yast2_scanner.xml"/>
-</chapter>
diff --git a/xml/yast2_keymouse.xml b/xml/yast2_keymouse.xml
index 42f0954195..48c41d6398 100644
--- a/xml/yast2_keymouse.xml
+++ b/xml/yast2_keymouse.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1
+<!DOCTYPE chapter
 [
   <!ENTITY % entities SYSTEM "generic-entities.ent">
     %entities;
 ]>
 
-<sect1 version="5.0" xml:id="sec-yast-hw-keym"
+<chapter version="5.0" xml:id="sec-yast-hw-keym"
   xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -51,8 +51,8 @@
   </step>
   <step>
    <para>
-    The result is stored in the files <filename>/etc/vconsole.conf</filename> 
-    (for text consoles) and 
+    The result is stored in the files <filename>/etc/vconsole.conf</filename>
+    (for text consoles) and
     <filename>/etc/X11/xorg.conf.d/00-keyboard.conf</filename> (for X11).
    </para>
   </step>
@@ -67,4 +67,4 @@
    </para>
   </step>
  </procedure>
-</sect1>
+</chapter>
diff --git a/xml/yast2_printer.xml b/xml/yast2_printer.xml
index b9887cc34d..cd00f45a11 100644
--- a/xml/yast2_printer.xml
+++ b/xml/yast2_printer.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1
+<!DOCTYPE chapter
 [
   <!ENTITY % entities SYSTEM "generic-entities.ent">
     %entities;
 ]>
 
-<sect1 version="5.0" xml:id="sec-yast-hw-print"
+<chapter version="5.0" xml:id="sec-yast-hw-print"
   xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -48,7 +48,7 @@
   </para>
  </note>
 
- <sect2 xml:id="sec-yast-hw-print-local">
+ <sect1 xml:id="sec-yast-hw-print-local">
   <title>Configuring printers</title>
   <para>
    Usually a USB printer is automatically detected. There are two possible
@@ -170,7 +170,7 @@
     </para>
    </step>
   </procedure>
-  <sect3 xml:id="sec-yast-hw-print-local-get-ppd">
+  <sect2 xml:id="sec-yast-hw-print-local-get-ppd">
    <title>Adding drivers with &yast;</title>
    <para>
     Not all printer drivers available for &productname; are installed by
@@ -279,8 +279,8 @@
      </para>
     </step>
    </procedure>
-  </sect3>
-  <sect3 xml:id="sec-yast-hw-print-local-tune">
+  </sect2>
+  <sect2 xml:id="sec-yast-hw-print-local-tune">
    <title>Editing a local printer configuration</title>
    <para>
     By editing an existing configuration for a printer you can change basic
@@ -324,10 +324,10 @@
      </para>
     </step>
    </procedure>
-  </sect3>
- </sect2>
+  </sect2>
+ </sect1>
 
- <sect2 xml:id="sec-yast-hw-print-network">
+ <sect1 xml:id="sec-yast-hw-print-network">
   <title>Configuring printing via the network with &yast;</title>
   <para>
    Network printers are not detected automatically. They must be configured
@@ -337,7 +337,7 @@
    network printing by choosing <guimenu>Printing via Network</guimenu> from
    the left pane in the &yast; printer module.
   </para>
-  <sect3 xml:id="sec-yast-hw-print-network-cups">
+  <sect2 xml:id="sec-yast-hw-print-network-cups">
    <title>Using CUPS</title>
    <para>
     In a Linux environment CUPS is usually used to print via the network. The
@@ -439,8 +439,8 @@
      </para>
     </step>
    </procedure>
-  </sect3>
-  <sect3 xml:id="sec-yast-hw-print-network-other">
+  </sect2>
+  <sect2 xml:id="sec-yast-hw-print-network-other">
    <title>Using print servers other than CUPS</title>
    <para>
     If your network offers print services via print servers other than CUPS,
@@ -451,10 +451,10 @@
     <guimenu>Connection Type</guimenu>. Ask your network administrator for
     details on configuring a network printer in your environment.
    </para>
-  </sect3>
- </sect2>
+  </sect2>
+ </sect1>
 
- <sect2 xml:id="sec-yast-hw-print-share">
+ <sect1 xml:id="sec-yast-hw-print-share">
   <title>Sharing printers over the network</title>
   <para>
    Printers managed by a local CUPS daemon can be shared over the network and
@@ -499,5 +499,5 @@
     </para>
    </step>
   </procedure>
- </sect2>
-</sect1>
+ </sect1>
+</chapter>
diff --git a/xml/yast2_scanner.xml b/xml/yast2_scanner.xml
index 1e4faa349c..3f18f9c48d 100644
--- a/xml/yast2_scanner.xml
+++ b/xml/yast2_scanner.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1
+<!DOCTYPE chapter
 [
   <!ENTITY % entities SYSTEM "generic-entities.ent">
     %entities;
 ]>
 
-<sect1 version="5.0" xml:id="sec-yast-hw-scan"
+<chapter version="5.0" xml:id="sec-yast-hw-scan"
   xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -72,7 +72,7 @@
   </step>
  </procedure>
 
- <sect2 xml:id="sec-yast-hw-scan-hp-allinone">
+ <sect1 xml:id="sec-yast-hw-scan-hp-allinone">
   <title>Configuring an HP all-in-one device</title>
   <para>
    An HP All-In-One device can be configured with &yast; even if it is
@@ -114,9 +114,9 @@
     </para>
    </step>
   </procedure>
- </sect2>
+ </sect1>
 
- <sect2 xml:id="sec-yast-hw-scan-network-server">
+ <sect1 xml:id="sec-yast-hw-scan-network-server">
   <title>Sharing a scanner over the network</title>
   <para>
    &productname; allows the sharing of a scanner over the network. To do
@@ -144,9 +144,9 @@
     </para>
    </step>
   </procedure>
- </sect2>
+ </sect1>
 
- <sect2 xml:id="sec-yast-hw-scan-network-client">
+ <sect1 xml:id="sec-yast-hw-scan-network-client">
   <title>Scanning over the network</title>
   <para>
    To use a scanner that is shared over the network, proceed as follows:
@@ -179,5 +179,5 @@
     </para>
    </step>
   </procedure>
- </sect2>
-</sect1>
+ </sect1>
+</chapter>
diff --git a/xml/yast2_sound.xml b/xml/yast2_sound.xml
index 4de8531e43..600a9d089b 100644
--- a/xml/yast2_sound.xml
+++ b/xml/yast2_sound.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1
+<!DOCTYPE chapter
 [
   <!ENTITY % entities SYSTEM "generic-entities.ent">
     %entities;
 ]>
 
 <!--taroth 2010-01-08: yast2 module maintainer: lslezak@suse.cz-->
-<sect1 version="5.0" xml:id="sec-yast-hw-sound"
+<chapter version="5.0" xml:id="sec-yast-hw-sound"
   xmlns="http://docbook.org/ns/docbook"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -54,10 +54,6 @@
   The dialog shows all sound cards that were detected.
  </para>
 
-<!--taroth 2010-01-18: removed information about probing for old sound chips as
- this referred to ISA sound cards only which are gone for several years already
- according to lslezak, no need to mention this any longer-->
-
  <procedure xml:id="pro-yast2-sound-add">
   <title>Configuring sound cards</title>
   <para>
@@ -260,4 +256,4 @@
   <filename>/etc/modprobe.d/sound</filename> and written to
   <filename>/etc/sysconfig/sound</filename>.
  </para>
-</sect1>
+</chapter>