diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c
index 67f830347..e190d5a77 100644
--- a/rigs/yaesu/ft817.c
+++ b/rigs/yaesu/ft817.c
@@ -295,7 +295,7 @@ const struct rig_caps ft817_caps =
     RIG_MODEL(RIG_MODEL_FT817),
     .model_name =          "FT-817",
     .mfg_name =            "Yaesu",
-    .version =             "20220402.0",
+    .version =             "20220407.0",
     .copyright =           "LGPL",
     .status =              RIG_STATUS_STABLE,
     .rig_type =            RIG_TYPE_TRANSCEIVER,
@@ -313,7 +313,7 @@ const struct rig_caps ft817_caps =
     .timeout =             FT817_TIMEOUT,
     .retry =               5,
     .has_get_func =        RIG_FUNC_NONE,
-    .has_set_func =        RIG_FUNC_LOCK | RIG_FUNC_TONE | RIG_FUNC_TSQL | RIG_FUNC_RIT,
+    .has_set_func =        RIG_FUNC_LOCK | RIG_FUNC_TONE | RIG_FUNC_TSQL | RIG_FUNC_CSQL | RIG_FUNC_RIT,
     .has_get_level =
     RIG_LEVEL_STRENGTH | RIG_LEVEL_RAWSTR | RIG_LEVEL_RFPOWER |
     RIG_LEVEL_ALC | RIG_LEVEL_SWR,
@@ -1612,6 +1612,16 @@ static int ft817_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
             return ft817_send_cmd(rig, FT817_NATIVE_CAT_SET_CTCSS_DCS_OFF);
         }
             
+    case RIG_FUNC_CSQL:
+        if (status)
+        {
+            return ft817_send_cmd(rig, FT817_NATIVE_CAT_SET_DCS_ON);
+        }
+        else
+        {
+            return ft817_send_cmd(rig, FT817_NATIVE_CAT_SET_CTCSS_DCS_OFF);
+        }            
+            
     case RIG_FUNC_RIT:
         if (status)
         {
diff --git a/rigs/yaesu/ft857.c b/rigs/yaesu/ft857.c
index 274d3eea8..4c14255ba 100644
--- a/rigs/yaesu/ft857.c
+++ b/rigs/yaesu/ft857.c
@@ -248,7 +248,7 @@ const struct rig_caps ft857_caps =
     RIG_MODEL(RIG_MODEL_FT857),
     .model_name =     "FT-857",
     .mfg_name =       "Yaesu",
-    .version =        "20220404.0",
+    .version =        "20220407.0",
     .copyright =      "LGPL",
     .status =         RIG_STATUS_STABLE,
     .rig_type =       RIG_TYPE_TRANSCEIVER,
@@ -266,7 +266,7 @@ const struct rig_caps ft857_caps =
     .timeout =        FT857_TIMEOUT,
     .retry =      0,
     .has_get_func =       RIG_FUNC_NONE,
-    .has_set_func =   RIG_FUNC_LOCK | RIG_FUNC_TONE | RIG_FUNC_TSQL | RIG_FUNC_RIT,
+    .has_set_func =   RIG_FUNC_LOCK | RIG_FUNC_TONE | RIG_FUNC_TSQL | RIG_FUNC_CSQL | RIG_FUNC_RIT,
     .has_get_level =  RIG_LEVEL_STRENGTH | RIG_LEVEL_RFPOWER,
     .has_set_level =  RIG_LEVEL_BAND_SELECT,
     .has_get_parm =   RIG_PARM_NONE,
@@ -1148,8 +1148,18 @@ int ft857_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
         {
             return ft857_send_cmd(rig, FT857_NATIVE_CAT_SET_CTCSS_DCS_OFF);
         }
+
+    case RIG_FUNC_CSQL:
+        if (status)
+        {
+            return ft857_send_cmd(rig, FT857_NATIVE_CAT_SET_DCS_ON);
+        }
+        else
+        {
+            return ft857_send_cmd(rig, FT857_NATIVE_CAT_SET_CTCSS_DCS_OFF);
+        }
             
-       case RIG_FUNC_RIT:
+    case RIG_FUNC_RIT:
         if (status)
         {
             return ft857_send_cmd(rig, FT857_NATIVE_CAT_CLAR_ON);
@@ -1158,9 +1168,8 @@ int ft857_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
         {
             return ft857_send_cmd(rig, FT857_NATIVE_CAT_CLAR_OFF);
         }        
-
+            
 #if 0
-
     case RIG_FUNC_CODE:   /* this doesn't exist */
         if (status)
         {
@@ -1170,17 +1179,6 @@ int ft857_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
         {
             return ft857_send_cmd(rig, FT857_NATIVE_CAT_SET_CTCSS_DCS_OFF);
         }
-
-    case RIG_FUNC_DSQL:   /* this doesn't exist */
-        if (status)
-        {
-            return ft857_send_cmd(rig, FT857_NATIVE_CAT_SET_DCS_ON);
-        }
-        else
-        {
-            return ft857_send_cmd(rig, FT857_NATIVE_CAT_SET_CTCSS_DCS_OFF);
-        }
-
 #endif
 
     default:
diff --git a/rigs/yaesu/ft897.c b/rigs/yaesu/ft897.c
index 43494cfc2..e89367b03 100644
--- a/rigs/yaesu/ft897.c
+++ b/rigs/yaesu/ft897.c
@@ -269,7 +269,7 @@ const struct rig_caps ft897_caps =
     .timeout =        FT897_TIMEOUT,
     .retry =      0,
     .has_get_func =       RIG_FUNC_NONE,
-    .has_set_func =   RIG_FUNC_LOCK | RIG_FUNC_TONE | RIG_FUNC_TSQL | RIG_FUNC_RIT,
+    .has_set_func =   RIG_FUNC_LOCK | RIG_FUNC_TONE | RIG_FUNC_TSQL | RIG_FUNC_CSQL | RIG_FUNC_RIT,
     .has_get_level =  RIG_LEVEL_STRENGTH | RIG_LEVEL_RFPOWER | RIG_LEVEL_SWR | RIG_LEVEL_RAWSTR | RIG_LEVEL_ALC,
     .has_set_level =  RIG_LEVEL_BAND_SELECT,
     .has_get_parm =   RIG_PARM_NONE,
@@ -395,7 +395,7 @@ const struct rig_caps ft897d_caps =
     RIG_MODEL(RIG_MODEL_FT897D),
     .model_name =     "FT-897D",
     .mfg_name =       "Yaesu",
-    .version =        "20210103.0",
+    .version =        "20220407.0",
     .copyright =      "LGPL",
     .status =         RIG_STATUS_STABLE,
     .rig_type =       RIG_TYPE_TRANSCEIVER,
@@ -1315,6 +1315,16 @@ int ft897_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
         {
             return ft897_send_cmd(rig, FT897_NATIVE_CAT_SET_CTCSS_DCS_OFF);
         }
+
+    case RIG_FUNC_CSQL:
+        if (status)
+        {
+            return ft897_send_cmd(rig, FT897_NATIVE_CAT_SET_DCS_ON);
+        }
+        else
+        {
+            return ft897_send_cmd(rig, FT897_NATIVE_CAT_SET_CTCSS_DCS_OFF);
+        }
             
    case RIG_FUNC_RIT:
         if (status)
@@ -1327,7 +1337,6 @@ int ft897_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
         }
 
 #if 0
-
     case RIG_FUNC_CODE:   /* this doesn't exist */
         if (status)
         {
@@ -1337,17 +1346,6 @@ int ft897_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
         {
             return ft897_send_cmd(rig, FT897_NATIVE_CAT_SET_CTCSS_DCS_OFF);
         }
-
-    case RIG_FUNC_DSQL:   /* this doesn't exist */
-        if (status)
-        {
-            return ft897_send_cmd(rig, FT897_NATIVE_CAT_SET_DCS_ON);
-        }
-        else
-        {
-            return ft897_send_cmd(rig, FT897_NATIVE_CAT_SET_CTCSS_DCS_OFF);
-        }
-
 #endif
 
     default: