diff --git a/configure.ac b/configure.ac
index 559199e89d3..a6152615ddd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -319,13 +319,14 @@ AC_ARG_WITH([gnutls-priorities],
 )
 
 AC_ARG_WITH([concurrent-fencing-default],
-    [AS_HELP_STRING([--with-concurrent-fencing-default],
-        [default value for concurrent-fencing cluster option @<:@false@:>@])],
+    [AS_HELP_STRING([--with-concurrent-fencing-default], m4_normalize([
+        default value for concurrent-fencing cluster option (deprecated)
+        @<:@true@:>@]))],
 )
 AS_CASE([$with_concurrent_fencing_default],
-        [""], [with_concurrent_fencing_default="false"],
-        [false], [],
-        [true], [PCMK_FEATURES="$PCMK_FEATURES default-concurrent-fencing"],
+        [""], [with_concurrent_fencing_default="true"],
+        [true], [],
+        [false], [PCMK_FEATURES="$PCMK_FEATURES concurrent-fencing-default-false"],
         [AC_MSG_ERROR([Invalid value "$with_concurrent_fencing_default" for --with-concurrent-fencing-default])]
 )
 
diff --git a/lib/common/options.c b/lib/common/options.c
index b85c6b0afb8..12893f6644b 100644
--- a/lib/common/options.c
+++ b/lib/common/options.c
@@ -630,11 +630,9 @@ static const pcmk__cluster_option_t fencing_params[] = {
         pcmk__opt_none,
         N_("The maximum number of actions can be performed in parallel on this "
             "device"),
-        N_("Cluster property concurrent-fencing=\"true\" needs to be "
-            "configured first. Then use this to specify the maximum number of "
-            "actions can be performed in parallel on this device. A value of "
-            "-1 means an unlimited number of actions can be performed in "
-            "parallel."),
+        N_("If the concurrent-fencing cluster property is \"true\", this "
+            "specifies the maximum number of actions that can be performed in "
+            "parallel on this device. A value of -1 means unlimited."),
     },
     {
         "pcmk_reboot_action", NULL, PCMK_VALUE_STRING, NULL,