diff --git a/daemons/fenced/fenced_cib.c b/daemons/fenced/fenced_cib.c
index 9ecf635f371..20144b54ccc 100644
--- a/daemons/fenced/fenced_cib.c
+++ b/daemons/fenced/fenced_cib.c
@@ -146,6 +146,15 @@ fencing_topology_init(void)
                                "[@" PCMK_XA_NAME "='"   \
                                     PCMK_OPT_FENCING_WATCHDOG_TIMEOUT "']"
 
+/* @COMPAT The "stonith-watchdog-timeout" option has been a deprecated alias
+ * for "fencing-watchdog-timeout" since 3.0.2. Make sure it still works as a
+ * fallback until it's dropped in a future release.
+ */
+#define XPATH_STONITH_WATCHDOG_TIMEOUT "//" PCMK_XE_NVPAIR      \
+                                       "[@" PCMK_XA_NAME \
+                                            "='stonith-watchdog-timeout']"
+
+
 static void
 update_fencing_watchdog_timeout_ms(xmlNode *cib)
 {
@@ -157,6 +166,17 @@ update_fencing_watchdog_timeout_ms(xmlNode *cib)
     stonith_watchdog_xml = pcmk__xpath_find_one(cib->doc,
                                                 XPATH_WATCHDOG_TIMEOUT,
                                                 PCMK__LOG_NEVER);
+
+    /* @COMPAT The "stonith-watchdog-timeout" option has been a deprecated alias
+     * for "fencing-watchdog-timeout" since 3.0.2. Make sure it still works as a
+     * fallback until it's dropped in a future release.
+     */
+    if (stonith_watchdog_xml == NULL) {
+        stonith_watchdog_xml = pcmk__xpath_find_one(cib->doc,
+                                                    XPATH_STONITH_WATCHDOG_TIMEOUT,
+                                                    PCMK__LOG_NEVER);
+    }
+
     if (stonith_watchdog_xml == NULL) {
         return;
     }
diff --git a/lib/lrmd/lrmd_client.c b/lib/lrmd/lrmd_client.c
index 4e7e74463e2..4e41f84be2d 100644
--- a/lib/lrmd/lrmd_client.c
+++ b/lib/lrmd/lrmd_client.c
@@ -979,7 +979,7 @@ lrmd__validate_remote_settings(lrmd_t *lrmd, GHashTable *hash)
 
     pcmk__xe_set(data, PCMK__XA_LRMD_ORIGIN, __func__);
 
-    value = g_hash_table_lookup(hash, PCMK_OPT_FENCING_WATCHDOG_TIMEOUT);
+    value = pcmk__cluster_option(hash, PCMK_OPT_FENCING_WATCHDOG_TIMEOUT);
     if ((value) &&
         (stonith__watchdog_fencing_enabled_for_node(native->remote_nodename))) {
        pcmk__xe_set(data, PCMK__XA_LRMD_WATCHDOG, value);