diff --git a/man/machine-tags.d.xml b/man/machine-tags.d.xml
index ec9316df49a..ed7ebcd761a 100644
--- a/man/machine-tags.d.xml
+++ b/man/machine-tags.d.xml
@@ -46,6 +46,10 @@
     stored in <filename>/etc/machine-info</filename>, thus applying the same configuration repeatedly has no
     further effect.</para>
 
+    <para>Note: when <filename>machine-tags.d/</filename> files are used, direct management of tags through
+    <command>hostnamectl tags …</command> or by editing the <filename>/etc/machine-info</filename> file
+    directly are <emphasis>not recommended</emphasis>. Please use one approach or the other.</para>
+
     <para>During boot, the configuration is applied automatically by
     <citerefentry><refentrytitle>systemd-machine-tags.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>