diff --git a/xml/ha_cluster_md.xml b/xml/ha_cluster_md.xml
index 8fc9e67f6..cb60e3233 100644
--- a/xml/ha_cluster_md.xml
+++ b/xml/ha_cluster_md.xml
@@ -77,11 +77,7 @@
    </listitem>
   </itemizedlist>
 
-  <para>
-   For better stability, use persistent device names
-   such as <literal>/dev/disk/by-id/<replaceable>DEVICE_ID</replaceable></literal>
-   instead of <literal>/dev/sd<replaceable>X</replaceable></literal> names.
-  </para>
+  &warning-persistent-shared-storage-name;
 
   <procedure>
    <step>
diff --git a/xml/phrases-decl.ent b/xml/phrases-decl.ent
index 7d8e09e7a..c70d25dae 100644
--- a/xml/phrases-decl.ent
+++ b/xml/phrases-decl.ent
@@ -652,3 +652,14 @@
      <systemitem class="resource">softdog</systemitem> can be used as kernel
      watchdog module.</para>
    </important>'>
+
+<!ENTITY warning-persistent-shared-storage-name '<warning xmlns="http://docbook.org/ns/docbook">
+  <title>Always use persistent device names</title>
+  <para>
+    Always use cluster-wide persistent device names, such as
+    <literal>/dev/disk/by-id/<replaceable>DEVICE_ID</replaceable></literal>.
+    Unstable device names like <literal>/dev/sd<replaceable>X</replaceable></literal> or
+    <literal>/dev/dm-<replaceable>X</replaceable></literal> might become mismatched on different
+    nodes, causing major problems across the cluster.
+  </para>
+</warning>'>