diff --git a/extra/gnuradio/gnuradio.h b/extra/gnuradio/gnuradio.h
index c76aea712..a071b0906 100644
--- a/extra/gnuradio/gnuradio.h
+++ b/extra/gnuradio/gnuradio.h
@@ -61,10 +61,10 @@ int graudioiq_open(RIG *rig);
 
 extern const struct confparams gnuradio_cfg_params[];
 
-extern const struct rig_caps gr_caps;
-extern const struct rig_caps mc4020_caps;
-extern const struct rig_caps graudio_caps;
-extern const struct rig_caps graudioiq_caps;
+extern struct rig_caps gr_caps;
+extern struct rig_caps mc4020_caps;
+extern struct rig_caps graudio_caps;
+extern struct rig_caps graudioiq_caps;
 
 __END_DECLS
 
diff --git a/extra/gnuradio/gr.c b/extra/gnuradio/gr.c
index d392d818b..3e73c87ae 100644
--- a/extra/gnuradio/gr.c
+++ b/extra/gnuradio/gr.c
@@ -49,7 +49,7 @@ static const struct gnuradio_priv_caps gr_priv_caps =
     .IF_center_freq = MHz(5.75),
 };
 
-const struct rig_caps gr_caps =
+struct rig_caps gr_caps =
 {
     .rig_model =      RIG_MODEL_GNURADIO,
     .model_name =     "GNU Radio dev",
diff --git a/extra/gnuradio/graudio.c b/extra/gnuradio/graudio.c
index d033d0d56..5cbf75d43 100644
--- a/extra/gnuradio/graudio.c
+++ b/extra/gnuradio/graudio.c
@@ -52,7 +52,7 @@ static const struct gnuradio_priv_caps graudio_priv_caps =
 };
 
 
-const struct rig_caps graudio_caps =
+struct rig_caps graudio_caps =
 {
     .rig_model =      RIG_MODEL_GRAUDIO,
     .model_name =     "GNU Radio GrAudio",
@@ -126,7 +126,7 @@ const struct rig_caps graudio_caps =
     .vfo_op =   gnuradio_vfo_op,
 };
 
-const struct rig_caps graudioiq_caps =
+struct rig_caps graudioiq_caps =
 {
     .rig_model =      RIG_MODEL_GRAUDIOIQ,
     .model_name =     "GNU Radio GrAudio I&Q",
diff --git a/extra/gnuradio/mc4020.c b/extra/gnuradio/mc4020.c
index 93a069bd5..eee1e3d61 100644
--- a/extra/gnuradio/mc4020.c
+++ b/extra/gnuradio/mc4020.c
@@ -49,7 +49,7 @@ static const struct gnuradio_priv_caps mc4020_priv_caps =
 };
 
 
-const struct rig_caps mc4020_caps =
+struct rig_caps mc4020_caps =
 {
     .rig_model =      RIG_MODEL_MC4020,
     .model_name =     "GNU Radio MC4020",
diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index 008b32eee..83ef311e6 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -2782,6 +2782,7 @@ struct rig_state {
     void *multicast_receiver_priv_data;
     rig_comm_status_t comm_status; /*!< Detailed rig control status */
     char device_id[HAMLIB_RIGNAMSIZ];
+    int dual_watch; /*!< Boolean DUAL_WATCH status */
 };
 
 /**
@@ -3595,7 +3596,7 @@ rig_set_uplink HAMLIB_PARAMS((RIG *rig,
 extern HAMLIB_EXPORT(const char *)
 rig_get_info HAMLIB_PARAMS((RIG *rig));
 
-extern HAMLIB_EXPORT(const struct rig_caps *)
+extern HAMLIB_EXPORT(struct rig_caps *)
 rig_get_caps HAMLIB_PARAMS((rig_model_t rig_model));
 
 extern HAMLIB_EXPORT(const freq_range_t *)
@@ -3676,13 +3677,13 @@ extern HAMLIB_EXPORT(FILE *)
 rig_set_debug_file HAMLIB_PARAMS((FILE *stream));
 
 extern HAMLIB_EXPORT(int)
-rig_register HAMLIB_PARAMS((const struct rig_caps *caps));
+rig_register HAMLIB_PARAMS((struct rig_caps *caps));
 
 extern HAMLIB_EXPORT(int)
 rig_unregister HAMLIB_PARAMS((rig_model_t rig_model));
 
 extern HAMLIB_EXPORT(int)
-rig_list_foreach HAMLIB_PARAMS((int (*cfunc)(const struct rig_caps *, rig_ptr_t),
+rig_list_foreach HAMLIB_PARAMS((int (*cfunc)(struct rig_caps *, rig_ptr_t),
                                 rig_ptr_t data));
 
 extern HAMLIB_EXPORT(int)
diff --git a/include/hamlib/rigclass.h b/include/hamlib/rigclass.h
index 2ae21403b..e65f839ea 100644
--- a/include/hamlib/rigclass.h
+++ b/include/hamlib/rigclass.h
@@ -46,7 +46,7 @@ public:
 #endif
 
 
-    const struct rig_caps *caps;
+    struct rig_caps *caps;
 
     // This method opens the communication port to the rig
     void open(void);
diff --git a/rigs/adat/adat.h b/rigs/adat/adat.h
index 542559e21..8a69f5848 100644
--- a/rigs/adat/adat.h
+++ b/rigs/adat/adat.h
@@ -610,7 +610,7 @@ int adat_power2mW(RIG *, unsigned int *, float, freq_t, rmode_t);
 
 int adat_get_powerstat(RIG *, powerstat_t *);
 
-extern const struct rig_caps adt_200a_caps;
+extern struct rig_caps adt_200a_caps;
 
 // ---------------------------------------------------------------------------
 //    END OF FILE
diff --git a/rigs/adat/adt_200a.c b/rigs/adat/adt_200a.c
index 9ce965e0b..5b12c593c 100644
--- a/rigs/adat/adt_200a.c
+++ b/rigs/adat/adt_200a.c
@@ -48,7 +48,7 @@
 //    ADT-200A HAMLIB CAPS / DESCRIPTION
 // ---------------------------------------------------------------------------
 
-const struct rig_caps adt_200a_caps =
+struct rig_caps adt_200a_caps =
 {
     RIG_MODEL(RIG_MODEL_ADT_200A),
     .model_name         =  "ADT-200A",
diff --git a/rigs/alinco/alinco.h b/rigs/alinco/alinco.h
index 14bbc628d..42294e51e 100644
--- a/rigs/alinco/alinco.h
+++ b/rigs/alinco/alinco.h
@@ -26,8 +26,8 @@
 
 #define BACKEND_VER "20200323"
 
-extern const struct rig_caps dx77_caps;
-extern const struct rig_caps dxsr8_caps;
+extern struct rig_caps dx77_caps;
+extern struct rig_caps dxsr8_caps;
 
 #define BUFSZ 32
 
diff --git a/rigs/alinco/dx77.c b/rigs/alinco/dx77.c
index 75287f59f..133dc8cfd 100644
--- a/rigs/alinco/dx77.c
+++ b/rigs/alinco/dx77.c
@@ -150,7 +150,7 @@ int dx77_get_mem(RIG *rig, vfo_t vfo, int *ch);
  *  - up/down
  *  - scan
  */
-const struct rig_caps dx77_caps =
+struct rig_caps dx77_caps =
 {
     RIG_MODEL(RIG_MODEL_DX77),
     .model_name =       "DX-77",
@@ -1260,7 +1260,7 @@ int dx77_set_parm(RIG *rig, setting_t parm, value_t val)
  */
 int dx77_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone)
 {
-    const struct rig_caps *caps;
+    struct rig_caps *caps;
     unsigned char tonebuf[BUFSZ];
     int i;
 
diff --git a/rigs/alinco/dxsr8.c b/rigs/alinco/dxsr8.c
index b6e6dd57d..ad774fc7d 100644
--- a/rigs/alinco/dxsr8.c
+++ b/rigs/alinco/dxsr8.c
@@ -75,7 +75,7 @@ int dxsr8_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt);
  *      https://yo5ptd.wordpress.com/2017/02/12/alinco-dx-sr8/
  * for a partially documented protocol
  */
-const struct rig_caps dxsr8_caps =
+struct rig_caps dxsr8_caps =
 {
     RIG_MODEL(RIG_MODEL_DXSR8),
     .model_name =       "DX-SR8",
diff --git a/rigs/anytone/anytone.h b/rigs/anytone/anytone.h
index bca5a4e77..d8ca681dc 100644
--- a/rigs/anytone/anytone.h
+++ b/rigs/anytone/anytone.h
@@ -7,7 +7,7 @@
 
 #define ANYTONE_RESPSZ 64
 
-extern const struct rig_caps anytone_d578_caps;
+extern struct rig_caps anytone_d578_caps;
 
 #ifdef PTHREAD
 #include <pthread.h>
diff --git a/rigs/anytone/d578.c b/rigs/anytone/d578.c
index 2493e8ab5..cf7ec4214 100644
--- a/rigs/anytone/d578.c
+++ b/rigs/anytone/d578.c
@@ -26,7 +26,7 @@
 #define D578_VFO (RIG_VFO_A|RIG_VFO_B)
 #define D578_MODES (RIG_MODE_USB|RIG_MODE_AM)
 
-const struct rig_caps anytone_d578_caps =
+struct rig_caps anytone_d578_caps =
 {
     RIG_MODEL(RIG_MODEL_ATD578UVIII),
     .model_name         =  "D578A",
diff --git a/rigs/aor/aor.h b/rigs/aor/aor.h
index d11556d3a..9b0da4c31 100644
--- a/rigs/aor/aor.h
+++ b/rigs/aor/aor.h
@@ -64,16 +64,16 @@ int aor_get_channel(RIG *rig, vfo_t vfo, channel_t *chan, int read_only);
 int aor_set_channel(RIG *rig, vfo_t vfo, const channel_t *chan);
 int aor_get_chan_all_cb (RIG * rig, vfo_t vfo, chan_cb_t chan_cb, rig_ptr_t);
 
-extern const struct rig_caps ar2700_caps;
-extern const struct rig_caps ar8200_caps;
-extern const struct rig_caps ar8000_caps;
-extern const struct rig_caps ar8600_caps;
-extern const struct rig_caps ar5000_caps;
-extern const struct rig_caps ar3000a_caps;
-extern const struct rig_caps ar7030_caps;
-extern const struct rig_caps ar3030_caps;
-extern const struct rig_caps ar5000a_caps;
-extern const struct rig_caps ar7030p_caps;
-extern const struct rig_caps sr2200_caps;
+extern struct rig_caps ar2700_caps;
+extern struct rig_caps ar8200_caps;
+extern struct rig_caps ar8000_caps;
+extern struct rig_caps ar8600_caps;
+extern struct rig_caps ar5000_caps;
+extern struct rig_caps ar3000a_caps;
+extern struct rig_caps ar7030_caps;
+extern struct rig_caps ar3030_caps;
+extern struct rig_caps ar5000a_caps;
+extern struct rig_caps ar7030p_caps;
+extern struct rig_caps sr2200_caps;
 
 #endif /* _AOR_H */
diff --git a/rigs/aor/ar2700.c b/rigs/aor/ar2700.c
index 9b57a3bd3..161ee0ebe 100644
--- a/rigs/aor/ar2700.c
+++ b/rigs/aor/ar2700.c
@@ -80,7 +80,7 @@ static const struct aor_priv_caps ar2700_priv_caps =
  * part of info from http://www.aoruk.com/2700.htm
  * Interface unit: CU-8232 (or equivalent)
  */
-const struct rig_caps ar2700_caps =
+struct rig_caps ar2700_caps =
 {
     RIG_MODEL(RIG_MODEL_AR2700),
     .model_name = "AR2700",
diff --git a/rigs/aor/ar3000.c b/rigs/aor/ar3000.c
index 1954d4b28..806be82dc 100644
--- a/rigs/aor/ar3000.c
+++ b/rigs/aor/ar3000.c
@@ -62,7 +62,7 @@ static int ar3k_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
  * TODO:
  * set_channel, get_channel, set_func MUTE,SQL, get_dcd, ...
  */
-const struct rig_caps ar3000a_caps =
+struct rig_caps ar3000a_caps =
 {
     RIG_MODEL(RIG_MODEL_AR3000A),
     .model_name = "AR3000A",
diff --git a/rigs/aor/ar3030.c b/rigs/aor/ar3030.c
index b21cf4259..572c619d9 100644
--- a/rigs/aor/ar3030.c
+++ b/rigs/aor/ar3030.c
@@ -93,7 +93,7 @@ struct ar3030_priv_data
  *
  * ar3030 rig capabilities.
  */
-const struct rig_caps ar3030_caps =
+struct rig_caps ar3030_caps =
 {
     RIG_MODEL(RIG_MODEL_AR3030),
     .model_name = "AR3030",
diff --git a/rigs/aor/ar5000.c b/rigs/aor/ar5000.c
index c010f5204..73a8ffd9c 100644
--- a/rigs/aor/ar5000.c
+++ b/rigs/aor/ar5000.c
@@ -99,7 +99,7 @@ static const struct aor_priv_caps ar5k_priv_caps =
  *
  * TODO: retrieve BW info, and rest of commands
  */
-const struct rig_caps ar5000_caps =
+struct rig_caps ar5000_caps =
 {
     RIG_MODEL(RIG_MODEL_AR5000),
     .model_name = "AR5000",
@@ -245,7 +245,7 @@ const struct rig_caps ar5000_caps =
  *
  * TODO: retrieve BW info, and rest of commands
  */
-const struct rig_caps ar5000a_caps =
+struct rig_caps ar5000a_caps =
 {
     RIG_MODEL(RIG_MODEL_AR5000A),
     .model_name = "AR5000A",
diff --git a/rigs/aor/ar7030.c b/rigs/aor/ar7030.c
index cd4183a74..430e859b4 100644
--- a/rigs/aor/ar7030.c
+++ b/rigs/aor/ar7030.c
@@ -772,7 +772,7 @@ static int ar7030_reset(RIG *rig, reset_t reset)
 
 
 
-const struct rig_caps ar7030_caps =
+struct rig_caps ar7030_caps =
 {
     RIG_MODEL(RIG_MODEL_AR7030),
     .model_name = "AR7030",
diff --git a/rigs/aor/ar7030p.c b/rigs/aor/ar7030p.c
index b2b17dc1d..a6d33cbf3 100644
--- a/rigs/aor/ar7030p.c
+++ b/rigs/aor/ar7030p.c
@@ -483,7 +483,7 @@ static int ar7030p_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 
     if (RIG_OK == rc)
     {
-        const struct rig_caps *caps = rig->caps;
+        struct rig_caps *caps = rig->caps;
 
         if ((caps->rx_range_list1[ 0 ].endf   > freq) &&
                 (caps->rx_range_list1[ 0 ].startf < freq))
@@ -1770,7 +1770,7 @@ static int ar7030p_get_channel(RIG *rig, vfo_t vfo, channel_t *chan,
     return (rc);
 }
 
-const struct rig_caps ar7030p_caps =
+struct rig_caps ar7030p_caps =
 {
     RIG_MODEL(RIG_MODEL_AR7030P),
     .model_name = "AR7030 Plus",
diff --git a/rigs/aor/ar8000.c b/rigs/aor/ar8000.c
index d2bccd95b..4cc825231 100644
--- a/rigs/aor/ar8000.c
+++ b/rigs/aor/ar8000.c
@@ -60,7 +60,7 @@ static const struct aor_priv_caps ar8000_priv_caps =
  *
  * part of info from http://www.aoruk.com/8000.htm
  */
-const struct rig_caps ar8000_caps =
+struct rig_caps ar8000_caps =
 {
     RIG_MODEL(RIG_MODEL_AR8000),
     .model_name = "AR8000",
diff --git a/rigs/aor/ar8200.c b/rigs/aor/ar8200.c
index 9f8e99275..c1a640fd3 100644
--- a/rigs/aor/ar8200.c
+++ b/rigs/aor/ar8200.c
@@ -84,7 +84,7 @@ static const struct aor_priv_caps ar8k_priv_caps =
  *
  * part of info from http://www.aoruk.com/8200.htm
  */
-const struct rig_caps ar8200_caps =
+struct rig_caps ar8200_caps =
 {
     RIG_MODEL(RIG_MODEL_AR8200),
     .model_name = "AR8200",
diff --git a/rigs/aor/ar8600.c b/rigs/aor/ar8600.c
index da81b881b..20b2a018f 100644
--- a/rigs/aor/ar8600.c
+++ b/rigs/aor/ar8600.c
@@ -86,7 +86,7 @@ static const struct aor_priv_caps ar8600_priv_caps =
  *
  * part of info from http://www.aoruk.com/8600.htm
  */
-const struct rig_caps ar8600_caps =
+struct rig_caps ar8600_caps =
 {
     RIG_MODEL(RIG_MODEL_AR8600),
     .model_name = "AR8600",
diff --git a/rigs/aor/sr2200.c b/rigs/aor/sr2200.c
index e8b081fa5..25a3c988c 100644
--- a/rigs/aor/sr2200.c
+++ b/rigs/aor/sr2200.c
@@ -119,7 +119,7 @@ static const struct aor_priv_caps sr2200_priv_caps =
  *
  * TODO: retrieve BW info, and rest of commands
  */
-const struct rig_caps sr2200_caps =
+struct rig_caps sr2200_caps =
 {
     RIG_MODEL(RIG_MODEL_SR2200),
     .model_name = "SR2200",
diff --git a/rigs/barrett/4050.c b/rigs/barrett/4050.c
index 24ea62ebb..6bd44ef56 100644
--- a/rigs/barrett/4050.c
+++ b/rigs/barrett/4050.c
@@ -94,7 +94,7 @@ static int barrett4050_open(RIG *rig)
     RETURNFUNC(RIG_OK);
 }
 
-const struct rig_caps barrett4050_caps =
+struct rig_caps barrett4050_caps =
 {
     RIG_MODEL(RIG_MODEL_BARRETT_4050),
     .model_name =       "4050",
diff --git a/rigs/barrett/950.c b/rigs/barrett/950.c
index 250b7966d..ac35231ca 100644
--- a/rigs/barrett/950.c
+++ b/rigs/barrett/950.c
@@ -66,7 +66,7 @@ static struct chan_map_s chan_map[] =
     { 28.0, 30.0, 9}
 };
 
-const struct rig_caps barrett950_caps =
+struct rig_caps barrett950_caps =
 {
     RIG_MODEL(RIG_MODEL_BARRETT_950),
     .model_name =       "950",
diff --git a/rigs/barrett/barrett.c b/rigs/barrett/barrett.c
index 40f930abe..37477a31a 100644
--- a/rigs/barrett/barrett.c
+++ b/rigs/barrett/barrett.c
@@ -756,7 +756,7 @@ int barrett_open(RIG *rig)
 }
 
 
-const struct rig_caps barrett_caps =
+struct rig_caps barrett_caps =
 {
     RIG_MODEL(RIG_MODEL_BARRETT_2050),
     .model_name =       "2050",
diff --git a/rigs/barrett/barrett.h b/rigs/barrett/barrett.h
index 5d5998048..633560593 100644
--- a/rigs/barrett/barrett.h
+++ b/rigs/barrett/barrett.h
@@ -36,9 +36,9 @@
 // RET_LEN is # of max channels times the per-channel response length
 #define BARRETT_RET_LEN 24*1000
 
-extern const struct rig_caps barrett_caps;
-extern const struct rig_caps barrett950_caps;
-extern const struct rig_caps barrett4050_caps;
+extern struct rig_caps barrett_caps;
+extern struct rig_caps barrett950_caps;
+extern struct rig_caps barrett4050_caps;
 
 struct barrett_priv_data {
     char cmd_str[BARRETT_DATA_LEN];       /* command string buffer */
diff --git a/rigs/codan/codan.c b/rigs/codan/codan.c
index ba3eabf82..f419b61b9 100644
--- a/rigs/codan/codan.c
+++ b/rigs/codan/codan.c
@@ -410,7 +410,7 @@ int codan_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
 
 
 
-const struct rig_caps envoy_caps =
+struct rig_caps envoy_caps =
 {
     RIG_MODEL(RIG_MODEL_CODAN_ENVOY),
     .model_name =       "Envoy",
@@ -475,7 +475,7 @@ const struct rig_caps envoy_caps =
     .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
 };
 
-const struct rig_caps ngs_caps =
+struct rig_caps ngs_caps =
 {
     RIG_MODEL(RIG_MODEL_CODAN_NGT),
     .model_name =       "NGT",
diff --git a/rigs/codan/codan.h b/rigs/codan/codan.h
index a3af29dbc..cd02ac1c0 100644
--- a/rigs/codan/codan.h
+++ b/rigs/codan/codan.h
@@ -34,8 +34,8 @@
 // But that would 9999*41 or 406KB so didn't do that right now
 #define CODAN_DATA_LEN 64
 
-extern const struct rig_caps envoy_caps;
-extern const struct rig_caps ngs_caps;
+extern struct rig_caps envoy_caps;
+extern struct rig_caps ngs_caps;
 
 struct codan_priv_data {
     char cmd_str[CODAN_DATA_LEN];       /* command string buffer */
diff --git a/rigs/dorji/dorji.h b/rigs/dorji/dorji.h
index 001620660..86482881d 100644
--- a/rigs/dorji/dorji.h
+++ b/rigs/dorji/dorji.h
@@ -24,7 +24,7 @@
 
 #include "hamlib/rig.h"
 
-extern const struct rig_caps dra818u_caps;
-extern const struct rig_caps dra818v_caps;
+extern struct rig_caps dra818u_caps;
+extern struct rig_caps dra818v_caps;
 
 #endif /* _DORJI_H */
diff --git a/rigs/dorji/dra818.c b/rigs/dorji/dra818.c
index a856a5fab..df1106122 100644
--- a/rigs/dorji/dra818.c
+++ b/rigs/dorji/dra818.c
@@ -519,7 +519,7 @@ int dra818_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
     return RIG_OK;
 }
 
-const struct rig_caps dra818u_caps =
+struct rig_caps dra818u_caps =
 {
     RIG_MODEL(RIG_MODEL_DORJI_DRA818U),
     .model_name =       "DRA818U",
@@ -623,7 +623,7 @@ const struct rig_caps dra818u_caps =
     .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
 };
 
-const struct rig_caps dra818v_caps =
+struct rig_caps dra818v_caps =
 {
     RIG_MODEL(RIG_MODEL_DORJI_DRA818V),
     .model_name =       "DRA818V",
diff --git a/rigs/drake/drake.h b/rigs/drake/drake.h
index f6f9d1d26..58e404933 100644
--- a/rigs/drake/drake.h
+++ b/rigs/drake/drake.h
@@ -53,8 +53,8 @@ int drake_set_powerstat (RIG * rig, powerstat_t status);
 int drake_get_powerstat (RIG * rig, powerstat_t *status);
 const char *drake_get_info(RIG *rig);
 
-extern const struct rig_caps r8a_caps;
-extern const struct rig_caps r8b_caps;
+extern struct rig_caps r8a_caps;
+extern struct rig_caps r8b_caps;
 
 #endif /* _DRAKE_H */
 
diff --git a/rigs/drake/r8a.c b/rigs/drake/r8a.c
index 0980362b6..87475a968 100644
--- a/rigs/drake/r8a.c
+++ b/rigs/drake/r8a.c
@@ -78,7 +78,7 @@
  *
  */
 
-const struct rig_caps r8a_caps =
+struct rig_caps r8a_caps =
 {
     RIG_MODEL(RIG_MODEL_DKR8A),
     .model_name = "R-8A",
diff --git a/rigs/drake/r8b.c b/rigs/drake/r8b.c
index e114cf5ea..11fa4f1fe 100644
--- a/rigs/drake/r8b.c
+++ b/rigs/drake/r8b.c
@@ -78,7 +78,7 @@
  *
  */
 
-const struct rig_caps r8b_caps =
+struct rig_caps r8b_caps =
 {
     RIG_MODEL(RIG_MODEL_DKR8B),
     .model_name = "R-8B",
diff --git a/rigs/dummy/aclog.c b/rigs/dummy/aclog.c
index 5384037f7..4427506ad 100644
--- a/rigs/dummy/aclog.c
+++ b/rigs/dummy/aclog.c
@@ -933,7 +933,7 @@ static int aclog_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
 }
 
 
-const struct rig_caps aclog_caps =
+struct rig_caps aclog_caps =
 {
     RIG_MODEL(RIG_MODEL_ACLOG),
     .model_name = "ACLog",
diff --git a/rigs/dummy/dummy.h b/rigs/dummy/dummy.h
index 919712188..bf269ea61 100644
--- a/rigs/dummy/dummy.h
+++ b/rigs/dummy/dummy.h
@@ -42,11 +42,11 @@
 extern struct rig_caps dummy_caps;
 extern struct rig_caps dummy_no_vfo_caps;
 extern struct rig_caps netrigctl_caps;
-extern const struct rig_caps flrig_caps;
-extern const struct rig_caps trxmanager_caps;
-extern const struct rig_caps tci1x_caps;
-extern const struct rig_caps aclog_caps;
-extern const struct rig_caps sdrsharp_caps;
+extern struct rig_caps flrig_caps;
+extern struct rig_caps trxmanager_caps;
+extern struct rig_caps tci1x_caps;
+extern struct rig_caps aclog_caps;
+extern struct rig_caps sdrsharp_caps;
 extern struct rig_caps quisk_caps;
 
 int netrigctl_get_vfo_mode(RIG *);
diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c
index ef2160bce..3ef94b1f5 100644
--- a/rigs/dummy/flrig.c
+++ b/rigs/dummy/flrig.c
@@ -138,7 +138,7 @@ static const struct confparams flrig_ext_parms[] =
     { RIG_CONF_END, NULL, }
 };
 
-const struct rig_caps flrig_caps =
+struct rig_caps flrig_caps =
 {
     RIG_MODEL(RIG_MODEL_FLRIG),
     .model_name = "FLRig",
diff --git a/rigs/dummy/flrig.h b/rigs/dummy/flrig.h
index 0e297944b..520143df5 100644
--- a/rigs/dummy/flrig.h
+++ b/rigs/dummy/flrig.h
@@ -28,6 +28,6 @@
 #define TRUE 1
 #define FALSE 0
 
-extern const struct rig_caps flrig_caps;
+extern struct rig_caps flrig_caps;
 
 #endif /* _FLRIG_H */
diff --git a/rigs/dummy/sdrsharp.c b/rigs/dummy/sdrsharp.c
index dea95497f..c649c5452 100644
--- a/rigs/dummy/sdrsharp.c
+++ b/rigs/dummy/sdrsharp.c
@@ -519,7 +519,7 @@ static int sdrsharp_get_vfo(RIG *rig, vfo_t *vfo)
     RETURNFUNC(RIG_OK);
 }
 
-const struct rig_caps sdrsharp_caps =
+struct rig_caps sdrsharp_caps =
 {
     RIG_MODEL(RIG_MODEL_SDRSHARP),
     .model_name = "SDR#/gpredict",
diff --git a/rigs/dummy/tci1x.c b/rigs/dummy/tci1x.c
index 409c1d5a1..86284fbe1 100644
--- a/rigs/dummy/tci1x.c
+++ b/rigs/dummy/tci1x.c
@@ -132,7 +132,7 @@ static const struct confparams tci1x_ext_parms[] =
     { RIG_CONF_END, NULL, }
 };
 
-const struct rig_caps tci1x_caps =
+struct rig_caps tci1x_caps =
 {
     RIG_MODEL(RIG_MODEL_TCI1X),
     .model_name = "TCI1.X",
diff --git a/rigs/elad/elad.c b/rigs/elad/elad.c
index 30832b79f..b798b40ff 100644
--- a/rigs/elad/elad.c
+++ b/rigs/elad/elad.c
@@ -2468,7 +2468,7 @@ int elad_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
  */
 int elad_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone)
 {
-    const struct rig_caps *caps;
+    struct rig_caps *caps;
     char tonebuf[16];
     int i;
 
@@ -2498,7 +2498,7 @@ int elad_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone)
 
 int elad_set_ctcss_tone_tn(RIG *rig, vfo_t vfo, tone_t tone)
 {
-    const struct rig_caps *caps = rig->caps;
+    struct rig_caps *caps = rig->caps;
     char buf[16];
     int i;
 
@@ -2560,7 +2560,7 @@ int elad_set_ctcss_tone_tn(RIG *rig, vfo_t vfo, tone_t tone)
 int elad_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
 {
     const struct elad_priv_data *priv = rig->state.priv;
-    const struct rig_caps *caps;
+    struct rig_caps *caps;
     char tonebuf[3];
     int i, retval;
     unsigned int tone_idx;
@@ -2637,7 +2637,7 @@ int elad_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
 
 int elad_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone)
 {
-    const struct rig_caps *caps = rig->caps;
+    struct rig_caps *caps = rig->caps;
     char buf[16];
     int i;
 
@@ -2693,7 +2693,7 @@ int elad_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone)
 
 int elad_get_ctcss_sql(RIG *rig, vfo_t vfo, tone_t *tone)
 {
-    const struct rig_caps *caps;
+    struct rig_caps *caps;
     char cmd[4];
     char tonebuf[6];
     int offs;
diff --git a/rigs/elad/elad.h b/rigs/elad/elad.h
index 39cac3627..aa689cc5d 100644
--- a/rigs/elad/elad.h
+++ b/rigs/elad/elad.h
@@ -164,7 +164,7 @@ int elad_get_trn(RIG *rig, int *trn);
 int get_elad_level(RIG *rig, const char *cmd, float *f);
 int get_elad_func(RIG *rig, const char *cmd, int *status);
 
-extern const struct rig_caps fdm_duo_caps;
+extern struct rig_caps fdm_duo_caps;
 
 #if 0
 /* use when not interested in the answer, but want to check its len */
diff --git a/rigs/elad/fdm_duo.c b/rigs/elad/fdm_duo.c
index db60fcc71..bb077b994 100644
--- a/rigs/elad/fdm_duo.c
+++ b/rigs/elad/fdm_duo.c
@@ -328,7 +328,7 @@ static struct elad_priv_caps fdm_duo_priv_caps =
  * Notice that some rigs share the same functions.
  * Also this struct is READONLY!
  */
-const struct rig_caps fdm_duo_caps =
+struct rig_caps fdm_duo_caps =
 {
     RIG_MODEL(RIG_MODEL_ELAD_FDM_DUO),
     .model_name = "FDM-DUO",
diff --git a/rigs/flexradio/dttsp.c b/rigs/flexradio/dttsp.c
index 0e03f2dfa..748e43a18 100644
--- a/rigs/flexradio/dttsp.c
+++ b/rigs/flexradio/dttsp.c
@@ -155,7 +155,7 @@ static const struct hamlib_vs_dttsp
             {  50, 40 }, /* +40 */ \
     } }
 
-const struct rig_caps dttsp_rig_caps =
+struct rig_caps dttsp_rig_caps =
 {
     RIG_MODEL(RIG_MODEL_DTTSP),
     .model_name =     "DttSP IPC",
@@ -241,7 +241,7 @@ const struct rig_caps dttsp_rig_caps =
 /*
  * The same as the previous IPC, but of type RIG_PORT_UDP_NETWORK
  */
-const struct rig_caps dttsp_udp_rig_caps =
+struct rig_caps dttsp_udp_rig_caps =
 {
     RIG_MODEL(RIG_MODEL_DTTSP_UDP),
     .model_name =     "DttSP UDP",
diff --git a/rigs/flexradio/flexradio.h b/rigs/flexradio/flexradio.h
index 446b3feb6..dd666605e 100644
--- a/rigs/flexradio/flexradio.h
+++ b/rigs/flexradio/flexradio.h
@@ -24,9 +24,9 @@
 
 #include "hamlib/rig.h"
 
-extern const struct rig_caps sdr1k_rig_caps;
-extern const struct rig_caps sdr1krfe_rig_caps;
-extern const struct rig_caps dttsp_rig_caps;
-extern const struct rig_caps dttsp_udp_rig_caps;
+extern struct rig_caps sdr1k_rig_caps;
+extern struct rig_caps sdr1krfe_rig_caps;
+extern struct rig_caps dttsp_rig_caps;
+extern struct rig_caps dttsp_udp_rig_caps;
 
 #endif /* _FLEXRADIO_H */
diff --git a/rigs/flexradio/sdr1k.c b/rigs/flexradio/sdr1k.c
index 86bb8fdda..c644e52dd 100644
--- a/rigs/flexradio/sdr1k.c
+++ b/rigs/flexradio/sdr1k.c
@@ -110,7 +110,7 @@ struct sdr1k_priv_data
  *    What about IOUD_Clock?
  */
 
-const struct rig_caps sdr1k_rig_caps =
+struct rig_caps sdr1k_rig_caps =
 {
     RIG_MODEL(RIG_MODEL_SDR1000),
     .model_name =     "SDR-1000",
diff --git a/rigs/gomspace/gs100.h b/rigs/gomspace/gs100.h
index 2372499c1..6bd5f3be3 100644
--- a/rigs/gomspace/gs100.h
+++ b/rigs/gomspace/gs100.h
@@ -47,8 +47,8 @@
 /* RIG capabilities descriptions */
 extern struct rig_caps gs100_caps;
 extern struct rig_caps netrigctl_caps;
-extern const struct rig_caps flrig_caps;
-extern const struct rig_caps trxmanager_caps;
+extern struct rig_caps flrig_caps;
+extern struct rig_caps trxmanager_caps;
 
 /*----------------------------------------------------------------------------*/
 
diff --git a/rigs/icmarine/icm700pro.c b/rigs/icmarine/icm700pro.c
index d8b5a6304..681ea4785 100644
--- a/rigs/icmarine/icm700pro.c
+++ b/rigs/icmarine/icm700pro.c
@@ -49,7 +49,7 @@ static const struct icmarine_priv_caps icm700pro_priv_caps =
     .default_remote_id = 2,
 };
 
-const struct rig_caps icm700pro_caps =
+struct rig_caps icm700pro_caps =
 {
     RIG_MODEL(RIG_MODEL_IC_M700PRO),
     .model_name = "IC-M700PRO",
diff --git a/rigs/icmarine/icm710.c b/rigs/icmarine/icm710.c
index f576c4c17..88587c71f 100644
--- a/rigs/icmarine/icm710.c
+++ b/rigs/icmarine/icm710.c
@@ -57,7 +57,7 @@ static const struct icm710_priv_caps icm710_priv_caps =
 };
 
 
-const struct rig_caps icm710_caps =
+struct rig_caps icm710_caps =
 {
     RIG_MODEL(RIG_MODEL_IC_M710),
     .model_name = "IC-M710",
@@ -251,7 +251,7 @@ int icm710_init(RIG *rig)
 {
     struct icm710_priv_data *priv;
     const struct icm710_priv_caps *priv_caps;
-    const struct rig_caps *caps;
+    struct rig_caps *caps;
 
     if (!rig || !rig->caps)
     {
diff --git a/rigs/icmarine/icm710.h b/rigs/icmarine/icm710.h
index edda6e455..73efd3ffb 100644
--- a/rigs/icmarine/icm710.h
+++ b/rigs/icmarine/icm710.h
@@ -75,8 +75,8 @@ int icm710_set_conf(RIG *rig, token_t token, const char *val);
 int icm710_get_conf(RIG *rig, token_t token, char *val);
 int icm710_get_conf2(RIG *rig, token_t token, char *val, int val_len);
 
-extern const struct rig_caps icm700pro_caps;
-extern const struct rig_caps icm710_caps;
-extern const struct rig_caps icm802_caps;
+extern struct rig_caps icm700pro_caps;
+extern struct rig_caps icm710_caps;
+extern struct rig_caps icm802_caps;
 
 #endif /* _ICM710_H */
diff --git a/rigs/icmarine/icm802.c b/rigs/icmarine/icm802.c
index 9165a5b3e..c42957f3e 100644
--- a/rigs/icmarine/icm802.c
+++ b/rigs/icmarine/icm802.c
@@ -50,7 +50,7 @@ static const struct icmarine_priv_caps icm802_priv_caps =
 };
 
 
-const struct rig_caps icm802_caps =
+struct rig_caps icm802_caps =
 {
     RIG_MODEL(RIG_MODEL_IC_M802),
     .model_name = "IC-M802",
diff --git a/rigs/icmarine/icm803.c b/rigs/icmarine/icm803.c
index b9d3d4f68..c1ef49564 100644
--- a/rigs/icmarine/icm803.c
+++ b/rigs/icmarine/icm803.c
@@ -50,7 +50,7 @@ static const struct icmarine_priv_caps icm803_priv_caps =
 };
 
 
-const struct rig_caps icm803_caps =
+struct rig_caps icm803_caps =
 {
     RIG_MODEL(RIG_MODEL_IC_M803),
     .model_name = "IC-M803",
diff --git a/rigs/icmarine/icmarine.c b/rigs/icmarine/icmarine.c
index 6c7bc8eae..5cc804336 100644
--- a/rigs/icmarine/icmarine.c
+++ b/rigs/icmarine/icmarine.c
@@ -113,7 +113,7 @@ int icmarine_init(RIG *rig)
 {
     struct icmarine_priv_data *priv;
     const struct icmarine_priv_caps *priv_caps;
-    const struct rig_caps *caps;
+    struct rig_caps *caps;
 
     if (!rig || !rig->caps)
     {
diff --git a/rigs/icmarine/icmarine.h b/rigs/icmarine/icmarine.h
index 8508389de..a1c0415e0 100644
--- a/rigs/icmarine/icmarine.h
+++ b/rigs/icmarine/icmarine.h
@@ -65,9 +65,9 @@ int icmarine_set_conf(RIG *rig, token_t token, const char *val);
 int icmarine_get_conf(RIG *rig, token_t token, char *val);
 int icmarine_get_conf2(RIG *rig, token_t token, char *val, int val_len);
 
-extern const struct rig_caps icm700pro_caps;
-extern const struct rig_caps icm710_caps;
-extern const struct rig_caps icm802_caps;
-extern const struct rig_caps icm803_caps;
+extern struct rig_caps icm700pro_caps;
+extern struct rig_caps icm710_caps;
+extern struct rig_caps icm802_caps;
+extern struct rig_caps icm803_caps;
 
 #endif /* _ICMARINE_H */
diff --git a/rigs/icom/delta2.c b/rigs/icom/delta2.c
index 349186cb2..ec43e8ab0 100644
--- a/rigs/icom/delta2.c
+++ b/rigs/icom/delta2.c
@@ -52,7 +52,7 @@ static const struct icom_priv_caps delta2_priv_caps =
     ic737_ts_sc_list  /* TODO: ts_sc_list */
 };
 
-const struct rig_caps delta2_caps =
+struct rig_caps delta2_caps =
 {
     RIG_MODEL(RIG_MODEL_DELTAII),
     .model_name = "Delta II",
diff --git a/rigs/icom/ic1275.c b/rigs/icom/ic1275.c
index 3d991ae36..0e3ae6585 100644
--- a/rigs/icom/ic1275.c
+++ b/rigs/icom/ic1275.c
@@ -40,7 +40,7 @@ static const struct icom_priv_caps ic1275_priv_caps =
     ic737_ts_sc_list
 };
 
-const struct rig_caps ic1275_caps =
+struct rig_caps ic1275_caps =
 {
     RIG_MODEL(RIG_MODEL_IC1275),
     .model_name = "IC-1275",
diff --git a/rigs/icom/ic271.c b/rigs/icom/ic271.c
index 26d7f4d99..dfa8d732a 100644
--- a/rigs/icom/ic271.c
+++ b/rigs/icom/ic271.c
@@ -49,7 +49,7 @@ static const struct icom_priv_caps ic271_priv_caps =
     ic737_ts_sc_list
 };
 
-const struct rig_caps ic271_caps =
+struct rig_caps ic271_caps =
 {
     RIG_MODEL(RIG_MODEL_IC271),
     .model_name = "IC-271",
diff --git a/rigs/icom/ic2730.c b/rigs/icom/ic2730.c
index acec5bc32..16ed41b01 100644
--- a/rigs/icom/ic2730.c
+++ b/rigs/icom/ic2730.c
@@ -59,7 +59,7 @@ static const struct icom_priv_caps ic2730_priv_caps =
     1,      /* no XCHG */
 };
 
-const struct rig_caps ic2730_caps =
+struct rig_caps ic2730_caps =
 {
     RIG_MODEL(RIG_MODEL_IC2730),
     .model_name = "IC-2730",
diff --git a/rigs/icom/ic275.c b/rigs/icom/ic275.c
index 89a4c330a..372fcf349 100644
--- a/rigs/icom/ic275.c
+++ b/rigs/icom/ic275.c
@@ -52,7 +52,7 @@ static const struct icom_priv_caps ic375_priv_caps =
     ic737_ts_sc_list
 };
 
-const struct rig_caps ic275_caps =
+struct rig_caps ic275_caps =
 {
     RIG_MODEL(RIG_MODEL_IC275),
     .model_name = "IC-275",
@@ -151,7 +151,7 @@ const struct rig_caps ic275_caps =
     .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
 };
 
-const struct rig_caps ic375_caps =
+struct rig_caps ic375_caps =
 {
     RIG_MODEL(RIG_MODEL_IC375),
     .model_name = "IC-375",
diff --git a/rigs/icom/ic471.c b/rigs/icom/ic471.c
index bd543b133..b1e1ec20c 100644
--- a/rigs/icom/ic471.c
+++ b/rigs/icom/ic471.c
@@ -48,7 +48,7 @@ static const struct icom_priv_caps ic471_priv_caps =
     ic737_ts_sc_list
 };
 
-const struct rig_caps ic471_caps =
+struct rig_caps ic471_caps =
 {
     RIG_MODEL(RIG_MODEL_IC471),
     .model_name = "IC-471",
diff --git a/rigs/icom/ic475.c b/rigs/icom/ic475.c
index 83dfbe1d4..f07dd22e5 100644
--- a/rigs/icom/ic475.c
+++ b/rigs/icom/ic475.c
@@ -44,7 +44,7 @@ static const struct icom_priv_caps ic475_priv_caps =
     ic737_ts_sc_list
 };
 
-const struct rig_caps ic475_caps =
+struct rig_caps ic475_caps =
 {
     RIG_MODEL(RIG_MODEL_IC475),
     .model_name = "IC-475",
@@ -150,7 +150,7 @@ static const struct icom_priv_caps ic575_priv_caps =
     ic737_ts_sc_list
 };
 
-const struct rig_caps ic575_caps =
+struct rig_caps ic575_caps =
 {
     RIG_MODEL(RIG_MODEL_IC575),
     .model_name = "IC-575",
diff --git a/rigs/icom/ic7000.c b/rigs/icom/ic7000.c
index 19304ddd8..0cd74e694 100644
--- a/rigs/icom/ic7000.c
+++ b/rigs/icom/ic7000.c
@@ -190,7 +190,7 @@ static const struct icom_priv_caps IC7000_priv_caps =
     .r2i_mode = ic7000_r2i_mode
 };
 
-const struct rig_caps ic7000_caps =
+struct rig_caps ic7000_caps =
 {
     RIG_MODEL(RIG_MODEL_IC7000),
     .model_name = "IC-7000",
diff --git a/rigs/icom/ic703.c b/rigs/icom/ic703.c
index 56f1ff134..5fe2534f9 100644
--- a/rigs/icom/ic703.c
+++ b/rigs/icom/ic703.c
@@ -81,7 +81,7 @@ static const struct icom_priv_caps ic703_priv_caps =
     ic706_ts_sc_list
 };
 
-const struct rig_caps ic703_caps =
+struct rig_caps ic703_caps =
 {
     RIG_MODEL(RIG_MODEL_IC703),
     .model_name = "IC-703",
diff --git a/rigs/icom/ic706.c b/rigs/icom/ic706.c
index fef2775fc..bc1cfe9ec 100644
--- a/rigs/icom/ic706.c
+++ b/rigs/icom/ic706.c
@@ -144,7 +144,7 @@ static const struct icom_priv_caps ic706_priv_caps =
     .r2i_mode = ic706_r2i_mode
 };
 
-const struct rig_caps ic706_caps =
+struct rig_caps ic706_caps =
 {
     RIG_MODEL(RIG_MODEL_IC706),
     .model_name = "IC-706",
@@ -292,7 +292,7 @@ static const struct icom_priv_caps ic706mkii_priv_caps =
     .r2i_mode = ic706_r2i_mode
 };
 
-const struct rig_caps ic706mkii_caps =
+struct rig_caps ic706mkii_caps =
 {
     RIG_MODEL(RIG_MODEL_IC706MKII),
     .model_name = "IC-706MkII",
@@ -463,7 +463,7 @@ static const struct icom_priv_caps ic706mkiig_priv_caps =
     .r2i_mode = ic706_r2i_mode
 };
 
-const struct rig_caps ic706mkiig_caps =
+struct rig_caps ic706mkiig_caps =
 {
     RIG_MODEL(RIG_MODEL_IC706MKIIG),
     .model_name = "IC-706MkIIG",
diff --git a/rigs/icom/ic707.c b/rigs/icom/ic707.c
index 83d8828c3..4376094a4 100644
--- a/rigs/icom/ic707.c
+++ b/rigs/icom/ic707.c
@@ -54,7 +54,7 @@ static const struct icom_priv_caps ic707_priv_caps =
     ic737_ts_sc_list
 };
 
-const struct rig_caps ic707_caps =
+struct rig_caps ic707_caps =
 {
     RIG_MODEL(RIG_MODEL_IC707),
     .model_name = "IC-707",
diff --git a/rigs/icom/ic7100.c b/rigs/icom/ic7100.c
index 16ed4d3fc..8cf36a268 100644
--- a/rigs/icom/ic7100.c
+++ b/rigs/icom/ic7100.c
@@ -311,7 +311,7 @@ int ic7100_get_clock(RIG *rig, int *year, int *month, int *day, int *hour,
     return retval;
 }
 
-const struct rig_caps ic7100_caps =
+struct rig_caps ic7100_caps =
 {
     RIG_MODEL(RIG_MODEL_IC7100),
     .model_name = "IC-7100",
diff --git a/rigs/icom/ic718.c b/rigs/icom/ic718.c
index b4f1d11e2..e2b40ff88 100644
--- a/rigs/icom/ic718.c
+++ b/rigs/icom/ic718.c
@@ -72,7 +72,7 @@ static const struct icom_priv_caps IC718_priv_caps =
     ic718_ts_sc_list
 };
 
-const struct rig_caps ic718_caps =
+struct rig_caps ic718_caps =
 {
     RIG_MODEL(RIG_MODEL_IC718),
     .model_name = "IC-718",
diff --git a/rigs/icom/ic7200.c b/rigs/icom/ic7200.c
index 094401cb5..1ed56584b 100644
--- a/rigs/icom/ic7200.c
+++ b/rigs/icom/ic7200.c
@@ -118,7 +118,7 @@ static const struct icom_priv_caps IC7200_priv_caps =
     },
 };
 
-const struct rig_caps ic7200_caps =
+struct rig_caps ic7200_caps =
 {
     RIG_MODEL(RIG_MODEL_IC7200),
     .model_name = "IC-7200",
diff --git a/rigs/icom/ic725.c b/rigs/icom/ic725.c
index 983269b3c..6bdf868db 100644
--- a/rigs/icom/ic725.c
+++ b/rigs/icom/ic725.c
@@ -52,7 +52,7 @@ static const struct icom_priv_caps ic725_priv_caps =
     ic737_ts_sc_list
 };
 
-const struct rig_caps ic725_caps =
+struct rig_caps ic725_caps =
 {
     RIG_MODEL(RIG_MODEL_IC725),
     .model_name = "IC-725",
diff --git a/rigs/icom/ic726.c b/rigs/icom/ic726.c
index 911332105..c2125b9fa 100644
--- a/rigs/icom/ic726.c
+++ b/rigs/icom/ic726.c
@@ -54,7 +54,7 @@ static const struct icom_priv_caps ic726_priv_caps =
     ic737_ts_sc_list
 };
 
-const struct rig_caps ic726_caps =
+struct rig_caps ic726_caps =
 {
     RIG_MODEL(RIG_MODEL_IC726),
     .model_name = "IC-726",
diff --git a/rigs/icom/ic728.c b/rigs/icom/ic728.c
index 980c367d9..964b013ae 100644
--- a/rigs/icom/ic728.c
+++ b/rigs/icom/ic728.c
@@ -54,7 +54,7 @@ static const struct icom_priv_caps ic728_priv_caps =
     ic737_ts_sc_list
 };
 
-const struct rig_caps ic728_caps =
+struct rig_caps ic728_caps =
 {
     RIG_MODEL(RIG_MODEL_IC728),
     .model_name = "IC-728",
@@ -173,7 +173,7 @@ static const struct icom_priv_caps ic729_priv_caps =
     ic737_ts_sc_list
 };
 
-const struct rig_caps ic729_caps =
+struct rig_caps ic729_caps =
 {
     RIG_MODEL(RIG_MODEL_IC729),
     .model_name = "IC-729",
diff --git a/rigs/icom/ic7300.c b/rigs/icom/ic7300.c
index 06679572f..5d74f8fff 100644
--- a/rigs/icom/ic7300.c
+++ b/rigs/icom/ic7300.c
@@ -689,7 +689,7 @@ static const struct icom_priv_caps IC905_priv_caps =
     .extcmds = ic705_extcmds,     /* Custom parameters */
 };
 
-const struct rig_caps ic7300_caps =
+struct rig_caps ic7300_caps =
 {
     RIG_MODEL(RIG_MODEL_IC7300),
     .model_name = "IC-7300",
@@ -1262,7 +1262,7 @@ struct rig_caps ic9700_caps =
     .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
 };
 
-const struct rig_caps ic705_caps =
+struct rig_caps ic705_caps =
 {
     RIG_MODEL(RIG_MODEL_IC705),
     .model_name = "IC-705",
@@ -1537,7 +1537,7 @@ const struct rig_caps ic705_caps =
     .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
 };
 
-const struct rig_caps ic905_caps =
+struct rig_caps ic905_caps =
 {
     RIG_MODEL(RIG_MODEL_IC905),
     .model_name = "IC-905",
diff --git a/rigs/icom/ic735.c b/rigs/icom/ic735.c
index 46a8f05a1..9b6cf3952 100644
--- a/rigs/icom/ic735.c
+++ b/rigs/icom/ic735.c
@@ -51,7 +51,7 @@ static const struct icom_priv_caps ic735_priv_caps =
     ic737_ts_sc_list
 };
 
-const struct rig_caps ic735_caps =
+struct rig_caps ic735_caps =
 {
     RIG_MODEL(RIG_MODEL_IC735),
     .model_name = "IC-735",
diff --git a/rigs/icom/ic736.c b/rigs/icom/ic736.c
index 52d0a5e57..979c336b6 100644
--- a/rigs/icom/ic736.c
+++ b/rigs/icom/ic736.c
@@ -58,7 +58,7 @@ static const struct icom_priv_caps ic736_priv_caps =
     ic737_ts_sc_list
 };
 
-const struct rig_caps ic736_caps =
+struct rig_caps ic736_caps =
 {
     RIG_MODEL(RIG_MODEL_IC736),
     .model_name = "IC-736",
diff --git a/rigs/icom/ic737.c b/rigs/icom/ic737.c
index 0d45770c4..e04ea3b3d 100644
--- a/rigs/icom/ic737.c
+++ b/rigs/icom/ic737.c
@@ -56,7 +56,7 @@ static const struct icom_priv_caps ic737_priv_caps =
     .ant_count = 2
 };
 
-const struct rig_caps ic737_caps =
+struct rig_caps ic737_caps =
 {
     RIG_MODEL(RIG_MODEL_IC737),
     .model_name = "IC-737",
diff --git a/rigs/icom/ic738.c b/rigs/icom/ic738.c
index 254d6217c..09d646c28 100644
--- a/rigs/icom/ic738.c
+++ b/rigs/icom/ic738.c
@@ -58,7 +58,7 @@ static const struct icom_priv_caps ic738_priv_caps =
     ic737_ts_sc_list
 };
 
-const struct rig_caps ic738_caps =
+struct rig_caps ic738_caps =
 {
     RIG_MODEL(RIG_MODEL_IC738),
     .model_name = "IC-738",
diff --git a/rigs/icom/ic7410.c b/rigs/icom/ic7410.c
index 1ebc4707c..35fa5b3c2 100644
--- a/rigs/icom/ic7410.c
+++ b/rigs/icom/ic7410.c
@@ -118,7 +118,7 @@ static const struct icom_priv_caps ic7410_priv_caps =
 };
 
 
-const struct rig_caps ic7410_caps =
+struct rig_caps ic7410_caps =
 {
     RIG_MODEL(RIG_MODEL_IC7410),
     .model_name = "IC-7410",
diff --git a/rigs/icom/ic746.c b/rigs/icom/ic746.c
index 2858908c9..cf76b33b0 100644
--- a/rigs/icom/ic746.c
+++ b/rigs/icom/ic746.c
@@ -176,7 +176,7 @@ static const struct icom_priv_caps ic746_priv_caps =
     },
 };
 
-const struct rig_caps ic746_caps =
+struct rig_caps ic746_caps =
 {
     RIG_MODEL(RIG_MODEL_IC746),
     .model_name = "IC-746",
@@ -412,7 +412,7 @@ static const struct icom_priv_caps ic746pro_priv_caps =
     },
 };
 
-const struct rig_caps ic746pro_caps =
+struct rig_caps ic746pro_caps =
 {
     RIG_MODEL(RIG_MODEL_IC746PRO),
     .model_name = "IC-746PRO",
diff --git a/rigs/icom/ic751.c b/rigs/icom/ic751.c
index 7cefc4bcf..1028f33e8 100644
--- a/rigs/icom/ic751.c
+++ b/rigs/icom/ic751.c
@@ -79,7 +79,7 @@ static const struct icom_priv_caps ic751_priv_caps =
     ic737_ts_sc_list
 };
 
-const struct rig_caps ic751_caps =
+struct rig_caps ic751_caps =
 {
     RIG_MODEL(RIG_MODEL_IC751),
     .model_name = "IC-751",
diff --git a/rigs/icom/ic756.c b/rigs/icom/ic756.c
index 199a74cc0..5c7bdb5ea 100644
--- a/rigs/icom/ic756.c
+++ b/rigs/icom/ic756.c
@@ -135,7 +135,7 @@ static const struct icom_priv_caps ic756_priv_caps =
     },
 };
 
-const struct rig_caps ic756_caps =
+struct rig_caps ic756_caps =
 {
     RIG_MODEL(RIG_MODEL_IC756),
     .model_name = "IC-756",
@@ -300,7 +300,7 @@ static const struct icom_priv_caps ic756pro_priv_caps =
     },
 };
 
-const struct rig_caps ic756pro_caps =
+struct rig_caps ic756pro_caps =
 {
     RIG_MODEL(RIG_MODEL_IC756PRO),
     .model_name = "IC-756PRO",
@@ -541,7 +541,7 @@ static int ic756pro2_get_ext_parm(RIG *rig, token_t token, value_t *val);
 
 #define IC756PROII_PARMS (RIG_PARM_ANN|RIG_PARM_BEEP|RIG_PARM_BACKLIGHT|RIG_PARM_TIME)
 
-const struct rig_caps ic756pro2_caps =
+struct rig_caps ic756pro2_caps =
 {
     RIG_MODEL(RIG_MODEL_IC756PROII),
     .model_name = "IC-756PROII",
@@ -977,7 +977,7 @@ static const struct icom_priv_caps ic756pro3_priv_caps =
          { 241, 30.0f } \
     } }
 
-const struct rig_caps ic756pro3_caps =
+struct rig_caps ic756pro3_caps =
 {
     RIG_MODEL(RIG_MODEL_IC756PROIII),
     .model_name = "IC-756PROIII",
diff --git a/rigs/icom/ic761.c b/rigs/icom/ic761.c
index 21f13db45..4a73b7a12 100644
--- a/rigs/icom/ic761.c
+++ b/rigs/icom/ic761.c
@@ -51,7 +51,7 @@ static const struct icom_priv_caps ic761_priv_caps =
     ic737_ts_sc_list
 };
 
-const struct rig_caps ic761_caps =
+struct rig_caps ic761_caps =
 {
     RIG_MODEL(RIG_MODEL_IC761),
     .model_name = "IC-761",
diff --git a/rigs/icom/ic765.c b/rigs/icom/ic765.c
index eca4708c6..64fb8daf6 100644
--- a/rigs/icom/ic765.c
+++ b/rigs/icom/ic765.c
@@ -54,7 +54,7 @@ static const struct icom_priv_caps ic765_priv_caps =
     ic737_ts_sc_list
 };
 
-const struct rig_caps ic765_caps =
+struct rig_caps ic765_caps =
 {
     RIG_MODEL(RIG_MODEL_IC765),
     .model_name = "IC-765",
diff --git a/rigs/icom/ic7700.c b/rigs/icom/ic7700.c
index debd3644f..0f43f01a1 100644
--- a/rigs/icom/ic7700.c
+++ b/rigs/icom/ic7700.c
@@ -253,7 +253,7 @@ int ic7700_get_clock(RIG *rig, int *year, int *month, int *day, int *hour,
     return retval;
 }
 
-const struct rig_caps ic7700_caps =
+struct rig_caps ic7700_caps =
 {
     RIG_MODEL(RIG_MODEL_IC7700),
     .model_name = "IC-7700",
diff --git a/rigs/icom/ic775.c b/rigs/icom/ic775.c
index 496a2755c..33d10113a 100644
--- a/rigs/icom/ic775.c
+++ b/rigs/icom/ic775.c
@@ -51,7 +51,7 @@ static const struct icom_priv_caps ic775_priv_caps =
     ic737_ts_sc_list
 };
 
-const struct rig_caps ic775_caps =
+struct rig_caps ic775_caps =
 {
     RIG_MODEL(RIG_MODEL_IC775),
     .model_name = "IC-775",
diff --git a/rigs/icom/ic78.c b/rigs/icom/ic78.c
index 79ea1b95d..9cf9e898e 100644
--- a/rigs/icom/ic78.c
+++ b/rigs/icom/ic78.c
@@ -62,7 +62,7 @@ static const struct icom_priv_caps ic78_priv_caps =
     ic706_ts_sc_list
 };
 
-const struct rig_caps ic78_caps =
+struct rig_caps ic78_caps =
 {
     RIG_MODEL(RIG_MODEL_IC78),
     .model_name = "IC-78",
diff --git a/rigs/icom/ic7800.c b/rigs/icom/ic7800.c
index 00af91d85..93a826bb4 100644
--- a/rigs/icom/ic7800.c
+++ b/rigs/icom/ic7800.c
@@ -153,7 +153,7 @@ static const struct icom_priv_caps ic7800_priv_caps =
     .extcmds = ic7800_extcmds,
 };
 
-const struct rig_caps ic7800_caps =
+struct rig_caps ic7800_caps =
 {
     RIG_MODEL(RIG_MODEL_IC7800),
     .model_name = "IC-7800",
diff --git a/rigs/icom/ic781.c b/rigs/icom/ic781.c
index 3811c0ecc..2eab2ce8b 100644
--- a/rigs/icom/ic781.c
+++ b/rigs/icom/ic781.c
@@ -55,7 +55,7 @@ static const struct icom_priv_caps ic781_priv_caps =
     ic737_ts_sc_list
 };
 
-const struct rig_caps ic781_caps =
+struct rig_caps ic781_caps =
 {
     RIG_MODEL(RIG_MODEL_IC781),
     .model_name = "IC-781",
diff --git a/rigs/icom/ic785x.c b/rigs/icom/ic785x.c
index 5745b92be..8a4b473fd 100644
--- a/rigs/icom/ic785x.c
+++ b/rigs/icom/ic785x.c
@@ -238,7 +238,7 @@ static struct icom_priv_caps ic785x_priv_caps =
     .x25_always = 1,
 };
 
-const struct rig_caps ic785x_caps =
+struct rig_caps ic785x_caps =
 {
     RIG_MODEL(RIG_MODEL_IC785x),
     .model_name = "IC-7850/7851",
diff --git a/rigs/icom/ic820h.c b/rigs/icom/ic820h.c
index 0ef357e5c..e81dc1637 100644
--- a/rigs/icom/ic820h.c
+++ b/rigs/icom/ic820h.c
@@ -50,7 +50,7 @@ static const struct icom_priv_caps ic820h_priv_caps =
     ic737_ts_sc_list
 };
 
-const struct rig_caps ic820h_caps =
+struct rig_caps ic820h_caps =
 {
     RIG_MODEL(RIG_MODEL_IC820),
     .model_name = "IC-820H",
diff --git a/rigs/icom/ic821h.c b/rigs/icom/ic821h.c
index d6b9f5fdc..89a72afdc 100644
--- a/rigs/icom/ic821h.c
+++ b/rigs/icom/ic821h.c
@@ -88,7 +88,7 @@ int ic821h_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
     RETURNFUNC(retval);
 }
 
-const struct rig_caps ic821h_caps =
+struct rig_caps ic821h_caps =
 {
     RIG_MODEL(RIG_MODEL_IC821H),
     .model_name = "IC-821H",
diff --git a/rigs/icom/ic910.c b/rigs/icom/ic910.c
index aa2a703f5..8908f2e26 100644
--- a/rigs/icom/ic910.c
+++ b/rigs/icom/ic910.c
@@ -196,7 +196,7 @@ int ic910_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
     }
 }
 
-const struct rig_caps ic910_caps =
+struct rig_caps ic910_caps =
 {
     RIG_MODEL(RIG_MODEL_IC910),
     .model_name =   "IC-910",
diff --git a/rigs/icom/ic9100.c b/rigs/icom/ic9100.c
index f7d70b751..5daaae1f2 100644
--- a/rigs/icom/ic9100.c
+++ b/rigs/icom/ic9100.c
@@ -104,7 +104,7 @@ static const struct icom_priv_caps ic9100_priv_caps =
     .extcmds = ic9100_extcmds,
 };
 
-const struct rig_caps ic9100_caps =
+struct rig_caps ic9100_caps =
 {
     RIG_MODEL(RIG_MODEL_IC9100),
     .model_name = "IC-9100",
diff --git a/rigs/icom/ic92d.c b/rigs/icom/ic92d.c
index 0c9480bf2..59362a8f2 100644
--- a/rigs/icom/ic92d.c
+++ b/rigs/icom/ic92d.c
@@ -93,7 +93,7 @@ static const struct icom_priv_caps ic92d_priv_caps =
     .serial_full_duplex = 1
 };
 
-const struct rig_caps ic92d_caps =
+struct rig_caps ic92d_caps =
 {
     RIG_MODEL(RIG_MODEL_IC92D),
     .model_name = "IC-92D", /* IC-E92D/IC-92AD */
diff --git a/rigs/icom/ic970.c b/rigs/icom/ic970.c
index 286f983af..333eb6337 100644
--- a/rigs/icom/ic970.c
+++ b/rigs/icom/ic970.c
@@ -45,7 +45,7 @@ static const struct icom_priv_caps ic970_priv_caps =
     ic737_ts_sc_list
 };
 
-const struct rig_caps ic970_caps =
+struct rig_caps ic970_caps =
 {
     RIG_MODEL(RIG_MODEL_IC970),
     .model_name = "IC-970",
diff --git a/rigs/icom/icf8101.c b/rigs/icom/icf8101.c
index 42a915e23..3fe58b502 100644
--- a/rigs/icom/icf8101.c
+++ b/rigs/icom/icf8101.c
@@ -380,7 +380,7 @@ int icf8101_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
 }
 
 
-const struct rig_caps icf8101_caps =
+struct rig_caps icf8101_caps =
 {
     RIG_MODEL(RIG_MODEL_ICF8101),
     .model_name =   "IC-F8101",
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index ccdb2957e..ce8f09006 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -973,7 +973,7 @@ static void icom_satmode_fix(RIG *rig, int satmode)
 int
 icom_rig_open(RIG *rig)
 {
-    int retval, retval_echo;
+    int retval, retval_echo, value;
     int satmode = 0;
     struct rig_state *rs = &rig->state;
     struct icom_priv_data *priv = (struct icom_priv_data *) rs->priv;
@@ -1017,6 +1017,14 @@ retry_open:
 
     if (retval == RIG_OK) // then we know our echo status
     {
+        // we need to know about dual watch for later use
+        rs->dual_watch = 0;
+        retval = rig_get_func(rig, RIG_VFO_CURR, RIG_FUNC_DUAL_WATCH, &value);
+
+        if (retval == RIG_OK) {
+            rs->dual_watch = value;
+        }
+    rig_debug(RIG_DEBUG_VERBOSE, "%s: dual_watch=%d\n", __func__, rs->dual_watch);
         rig_debug(RIG_DEBUG_TRACE, "%s: echo status known, getting frequency\n",
                   __func__);
         rs->rigport.retry = 0;
@@ -1120,6 +1128,7 @@ retry_open:
 #endif
 
     rs->rigport.retry = retry_save;
+
     RETURNFUNC(RIG_OK);
 }
 
@@ -1173,6 +1182,7 @@ static int icom_set_default_vfo(RIG *rig)
     rig_debug(RIG_DEBUG_TRACE, "%s: called, curr_vfo=%s\n", __func__,
               rig_strvfo(rig->state.current_vfo));
 
+    // we need to know if dual watch is on
     if (VFO_HAS_MAIN_SUB_A_B_ONLY)
     {
         rig_debug(RIG_DEBUG_TRACE, "%s: setting default as MAIN/VFOA\n",
@@ -1385,8 +1395,10 @@ int icom_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
         cmd = C_SET_FREQ;
         subcmd = -1;
 
-        if (ICOM_IS_ID5100 || ICOM_IS_ID4100 || ICOM_IS_ID31 || ICOM_IS_ID51)
+#if 0
+        if (rig->state.cache.ptt && (ICOM_IS_ID5100 || ICOM_IS_ID4100 || ICOM_IS_ID31 || ICOM_IS_ID51))
         {
+            rig_debug(RIG_DEBUG_TRACE, "%s(%d): ID55100 0x00\n", __func__, __LINE__);
             // for these rigs 0x00 is setting the freq and 0x03 is just for reading
             cmd = 0x00;
             // temporary fix for ID5100 not giving ACK/NAK on 0x00 freq on E8 firmware
@@ -1400,6 +1412,7 @@ int icom_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
             return RIG_OK;
         }
         else
+#endif
         {
             retval = icom_transaction(rig, cmd, subcmd, freqbuf, freq_len, ackbuf,
                                       &ack_len);
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index a16230076..cc800675c 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -279,7 +279,7 @@ struct icom_priv_data
     struct icom_spectrum_scope_cache spectrum_scope_cache[HAMLIB_MAX_SPECTRUM_SCOPES]; /*!< Cached Icom spectrum scope data used during reception of the data. The array index must match the scope ID. */
     freq_t other_freq; /*!< Our other freq depending on which vfo is selected */
     int vfo_flag; // used to skip vfo check when frequencies are equal
-    int dual_watch; // dual watch mode on status
+    int dual_watch_main_sub; // 0=main, 1=sub
 };
 
 extern const struct ts_sc_list r8500_ts_sc_list[];
@@ -422,94 +422,94 @@ extern const struct confparams icom_ext_funcs[];
 extern const struct confparams icom_ext_parms[];
 extern const struct cmdparams icom_ext_cmds[];
 
-extern const struct rig_caps ic703_caps;
-extern const struct rig_caps ic705_caps;
-extern const struct rig_caps ic706_caps;
-extern const struct rig_caps ic706mkii_caps;
-extern const struct rig_caps ic706mkiig_caps;
-extern const struct rig_caps ic707_caps;
-extern const struct rig_caps ic718_caps;
-extern const struct rig_caps ic725_caps;
-extern const struct rig_caps ic726_caps;
-extern const struct rig_caps ic728_caps;
-extern const struct rig_caps ic729_caps;
-extern const struct rig_caps ic735_caps;
-extern const struct rig_caps ic736_caps;
-extern const struct rig_caps ic737_caps;
-extern const struct rig_caps ic738_caps;
-extern const struct rig_caps ic746_caps;
-extern const struct rig_caps ic7410_caps;
-extern const struct rig_caps ic746pro_caps;
-extern const struct rig_caps ic756_caps;
-extern const struct rig_caps ic756pro_caps;
-extern const struct rig_caps ic756pro2_caps;
-extern const struct rig_caps ic756pro3_caps;
-extern const struct rig_caps ic751_caps;
+extern struct rig_caps ic703_caps;
+extern struct rig_caps ic705_caps;
+extern struct rig_caps ic706_caps;
+extern struct rig_caps ic706mkii_caps;
+extern struct rig_caps ic706mkiig_caps;
+extern struct rig_caps ic707_caps;
+extern struct rig_caps ic718_caps;
+extern struct rig_caps ic725_caps;
+extern struct rig_caps ic726_caps;
+extern struct rig_caps ic728_caps;
+extern struct rig_caps ic729_caps;
+extern struct rig_caps ic735_caps;
+extern struct rig_caps ic736_caps;
+extern struct rig_caps ic737_caps;
+extern struct rig_caps ic738_caps;
+extern struct rig_caps ic746_caps;
+extern struct rig_caps ic7410_caps;
+extern struct rig_caps ic746pro_caps;
+extern struct rig_caps ic756_caps;
+extern struct rig_caps ic756pro_caps;
+extern struct rig_caps ic756pro2_caps;
+extern struct rig_caps ic756pro3_caps;
+extern struct rig_caps ic751_caps;
 extern struct rig_caps ic7600_caps; // need to modify targetable_vfo depending on response to 0x25 cmd
 extern struct rig_caps ic7610_caps;
-extern const struct rig_caps ic761_caps;
-extern const struct rig_caps ic765_caps;
-extern const struct rig_caps ic7700_caps;
-extern const struct rig_caps ic775_caps;
-extern const struct rig_caps ic78_caps;
-extern const struct rig_caps ic7800_caps;
-extern const struct rig_caps ic785x_caps;
-extern const struct rig_caps ic7000_caps;
-extern const struct rig_caps ic7100_caps;
-extern const struct rig_caps ic7200_caps;
-extern const struct rig_caps ic7300_caps;
-extern const struct rig_caps ic781_caps;
-extern const struct rig_caps ic820h_caps;
-extern const struct rig_caps ic821h_caps;
-extern const struct rig_caps ic905_caps;
-extern const struct rig_caps ic910_caps;
-extern const struct rig_caps ic9100_caps;
-extern const struct rig_caps ic970_caps;
+extern struct rig_caps ic761_caps;
+extern struct rig_caps ic765_caps;
+extern struct rig_caps ic7700_caps;
+extern struct rig_caps ic775_caps;
+extern struct rig_caps ic78_caps;
+extern struct rig_caps ic7800_caps;
+extern struct rig_caps ic785x_caps;
+extern struct rig_caps ic7000_caps;
+extern struct rig_caps ic7100_caps;
+extern struct rig_caps ic7200_caps;
+extern struct rig_caps ic7300_caps;
+extern struct rig_caps ic781_caps;
+extern struct rig_caps ic820h_caps;
+extern struct rig_caps ic821h_caps;
+extern struct rig_caps ic905_caps;
+extern struct rig_caps ic910_caps;
+extern struct rig_caps ic9100_caps;
+extern struct rig_caps ic970_caps;
 extern struct rig_caps ic9700_caps;
-extern const struct rig_caps icrx7_caps;
-extern const struct rig_caps icr10_caps;
-extern const struct rig_caps icr20_caps;
-extern const struct rig_caps icr6_caps;
-extern const struct rig_caps icr71_caps;
-extern const struct rig_caps icr72_caps;
-extern const struct rig_caps icr75_caps;
-extern const struct rig_caps icr7000_caps;
-extern const struct rig_caps icr7100_caps;
-extern const struct rig_caps icr8500_caps;
-extern const struct rig_caps icr9000_caps;
-extern const struct rig_caps icr9500_caps;
-extern const struct rig_caps ic271_caps;
-extern const struct rig_caps ic275_caps;
-extern const struct rig_caps ic375_caps;
-extern const struct rig_caps ic471_caps;
-extern const struct rig_caps ic475_caps;
-extern const struct rig_caps ic575_caps;
-extern const struct rig_caps ic1275_caps;
-extern const struct rig_caps icf8101_caps;
+extern struct rig_caps icrx7_caps;
+extern struct rig_caps icr10_caps;
+extern struct rig_caps icr20_caps;
+extern struct rig_caps icr6_caps;
+extern struct rig_caps icr71_caps;
+extern struct rig_caps icr72_caps;
+extern struct rig_caps icr75_caps;
+extern struct rig_caps icr7000_caps;
+extern struct rig_caps icr7100_caps;
+extern struct rig_caps icr8500_caps;
+extern struct rig_caps icr9000_caps;
+extern struct rig_caps icr9500_caps;
+extern struct rig_caps ic271_caps;
+extern struct rig_caps ic275_caps;
+extern struct rig_caps ic375_caps;
+extern struct rig_caps ic471_caps;
+extern struct rig_caps ic475_caps;
+extern struct rig_caps ic575_caps;
+extern struct rig_caps ic1275_caps;
+extern struct rig_caps icf8101_caps;
 
-extern const struct rig_caps omnivip_caps;
-extern const struct rig_caps delta2_caps;
+extern struct rig_caps omnivip_caps;
+extern struct rig_caps delta2_caps;
 
-extern const struct rig_caps os456_caps;
-extern const struct rig_caps os535_caps;
+extern struct rig_caps os456_caps;
+extern struct rig_caps os535_caps;
 
-extern const struct rig_caps ic92d_caps;
-extern const struct rig_caps id1_caps;
-extern const struct rig_caps id31_caps;
-extern const struct rig_caps id51_caps;
-extern const struct rig_caps id4100_caps;
-extern const struct rig_caps id5100_caps;
-extern const struct rig_caps ic2730_caps;
+extern struct rig_caps ic92d_caps;
+extern struct rig_caps id1_caps;
+extern struct rig_caps id31_caps;
+extern struct rig_caps id51_caps;
+extern struct rig_caps id4100_caps;
+extern struct rig_caps id5100_caps;
+extern struct rig_caps ic2730_caps;
 
-extern const struct rig_caps perseus_caps;
+extern struct rig_caps perseus_caps;
 
-extern const struct rig_caps x108g_caps;
-extern const struct rig_caps x6100_caps;
-extern const struct rig_caps g90_caps;
-extern const struct rig_caps x5105_caps;
+extern struct rig_caps x108g_caps;
+extern struct rig_caps x6100_caps;
+extern struct rig_caps g90_caps;
+extern struct rig_caps x5105_caps;
 
-extern const struct rig_caps icr8600_caps;
-extern const struct rig_caps icr30_caps;
+extern struct rig_caps icr8600_caps;
+extern struct rig_caps icr30_caps;
 
 #define RIG_IS_IC1271 (rig->state.rig_model == RIG_MODEL_IC1271)
 #define RIG_IS_IC1275 (rig->state.rig_model == RIG_MODEL_IC1275)
diff --git a/rigs/icom/icr10.c b/rigs/icom/icr10.c
index b67f9ccb9..5eae14491 100644
--- a/rigs/icom/icr10.c
+++ b/rigs/icom/icr10.c
@@ -51,7 +51,7 @@ static struct icom_priv_caps icr10_priv_caps =
     r8500_ts_sc_list  /* wrong, but don't have set_ts anyway */
 };
 
-const struct rig_caps icr10_caps =
+struct rig_caps icr10_caps =
 {
     RIG_MODEL(RIG_MODEL_ICR10),
     .model_name = "IC-R10",
diff --git a/rigs/icom/icr20.c b/rigs/icom/icr20.c
index 4952c49f8..91c9ac99a 100644
--- a/rigs/icom/icr20.c
+++ b/rigs/icom/icr20.c
@@ -51,7 +51,7 @@ static struct icom_priv_caps icr20_priv_caps =
     r8500_ts_sc_list  /* wrong, but don't have set_ts anyway */
 };
 
-const struct rig_caps icr20_caps =
+struct rig_caps icr20_caps =
 {
     RIG_MODEL(RIG_MODEL_ICR20),
     .model_name = "IC-R20",
diff --git a/rigs/icom/icr30.c b/rigs/icom/icr30.c
index 9c61121ac..7ce95a322 100644
--- a/rigs/icom/icr30.c
+++ b/rigs/icom/icr30.c
@@ -124,7 +124,7 @@ static struct icom_priv_caps icr30_priv_caps =
     .extcmds = icr30_extcmds      /* Custom ext_parm parameters */
 };
 
-const struct rig_caps icr30_caps =
+struct rig_caps icr30_caps =
 {
     RIG_MODEL(RIG_MODEL_ICR30),
     .model_name = "IC-R30",
diff --git a/rigs/icom/icr6.c b/rigs/icom/icr6.c
index 2f44357c2..eab519902 100644
--- a/rigs/icom/icr6.c
+++ b/rigs/icom/icr6.c
@@ -51,7 +51,7 @@ static struct icom_priv_caps icr6_priv_caps =
     .ant_count = 2
 };
 
-const struct rig_caps icr6_caps =
+struct rig_caps icr6_caps =
 {
     RIG_MODEL(RIG_MODEL_ICR6),
     .model_name = "IC-R6",
diff --git a/rigs/icom/icr7000.c b/rigs/icom/icr7000.c
index 028c45d0f..3636046b8 100644
--- a/rigs/icom/icr7000.c
+++ b/rigs/icom/icr7000.c
@@ -51,7 +51,7 @@ static struct icom_priv_caps icr7000_priv_caps =
 /*
  * ICR7000 rigs capabilities.
  */
-const struct rig_caps icr7000_caps =
+struct rig_caps icr7000_caps =
 {
     RIG_MODEL(RIG_MODEL_ICR7000),
     .model_name = "IC-R7000",
@@ -174,7 +174,7 @@ static struct icom_priv_caps icr7100_priv_caps =
 /*
  * ICR7100A rig capabilities.
  */
-const struct rig_caps icr7100_caps =
+struct rig_caps icr7100_caps =
 {
     RIG_MODEL(RIG_MODEL_ICR7100),
     .model_name = "IC-R7100",
diff --git a/rigs/icom/icr71.c b/rigs/icom/icr71.c
index d933be0c6..660fba2e8 100644
--- a/rigs/icom/icr71.c
+++ b/rigs/icom/icr71.c
@@ -44,7 +44,7 @@ static struct icom_priv_caps icr71_priv_caps =
     ic737_ts_sc_list    /* none actually */
 };
 
-const struct rig_caps icr71_caps =
+struct rig_caps icr71_caps =
 {
     RIG_MODEL(RIG_MODEL_ICR71),
     .model_name = "IC-R71",
diff --git a/rigs/icom/icr72.c b/rigs/icom/icr72.c
index 6708b53a2..115a2abd5 100644
--- a/rigs/icom/icr72.c
+++ b/rigs/icom/icr72.c
@@ -45,7 +45,7 @@ static struct icom_priv_caps icr72_priv_caps =
     ic737_ts_sc_list
 };
 
-const struct rig_caps icr72_caps =
+struct rig_caps icr72_caps =
 {
     RIG_MODEL(RIG_MODEL_ICR72),
     .model_name = "IC-R72",
diff --git a/rigs/icom/icr75.c b/rigs/icom/icr75.c
index 9c044b87b..f27ddb37c 100644
--- a/rigs/icom/icr75.c
+++ b/rigs/icom/icr75.c
@@ -103,7 +103,7 @@ static struct icom_priv_caps icr75_priv_caps =
     .ant_count = 2
 };
 
-const struct rig_caps icr75_caps =
+struct rig_caps icr75_caps =
 {
     RIG_MODEL(RIG_MODEL_ICR75),
     .model_name = "IC-R75",
diff --git a/rigs/icom/icr8500.c b/rigs/icom/icr8500.c
index 187062db6..8e0496b95 100644
--- a/rigs/icom/icr8500.c
+++ b/rigs/icom/icr8500.c
@@ -70,7 +70,7 @@ static struct icom_priv_caps icr8500_priv_caps =
 /*
  * IC-R8500 rig capabilities.
  */
-const struct rig_caps icr8500_caps =
+struct rig_caps icr8500_caps =
 {
     RIG_MODEL(RIG_MODEL_ICR8500),
     .model_name = "ICR-8500",
diff --git a/rigs/icom/icr8600.c b/rigs/icom/icr8600.c
index da932200d..e3a012b4c 100644
--- a/rigs/icom/icr8600.c
+++ b/rigs/icom/icr8600.c
@@ -128,7 +128,7 @@ static struct icom_priv_caps icr8600_priv_caps =
     .extcmds = icr8600_extcmds      /* Custom ext_cmd parameters */
 };
 
-const struct rig_caps icr8600_caps =
+struct rig_caps icr8600_caps =
 {
     RIG_MODEL(RIG_MODEL_ICR8600),
     .model_name = "IC-R8600",
diff --git a/rigs/icom/icr9000.c b/rigs/icom/icr9000.c
index ecb88d523..f84239228 100644
--- a/rigs/icom/icr9000.c
+++ b/rigs/icom/icr9000.c
@@ -62,7 +62,7 @@ static struct icom_priv_caps icr9000_priv_caps =
 /*
  * ICR9000A rig capabilities.
  */
-const struct rig_caps icr9000_caps =
+struct rig_caps icr9000_caps =
 {
     RIG_MODEL(RIG_MODEL_ICR9000),
     .model_name = "IC-R9000",
diff --git a/rigs/icom/icr9500.c b/rigs/icom/icr9500.c
index 741306019..7e9532be1 100644
--- a/rigs/icom/icr9500.c
+++ b/rigs/icom/icr9500.c
@@ -76,7 +76,7 @@ static struct icom_priv_caps icr9500_priv_caps =
 /*
  * ICR9500A rig capabilities.
  */
-const struct rig_caps icr9500_caps =
+struct rig_caps icr9500_caps =
 {
     RIG_MODEL(RIG_MODEL_ICR9500),
     .model_name = "IC-R9500",
diff --git a/rigs/icom/icrx7.c b/rigs/icom/icrx7.c
index 42af41238..cd5981297 100644
--- a/rigs/icom/icrx7.c
+++ b/rigs/icom/icrx7.c
@@ -49,7 +49,7 @@ static struct icom_priv_caps icrx7_priv_caps =
     r8500_ts_sc_list    /* wrong, but don't have set_ts anyway */
 };
 
-const struct rig_caps icrx7_caps =
+struct rig_caps icrx7_caps =
 {
     RIG_MODEL(RIG_MODEL_ICRX7),
     .model_name = "IC-RX7",
diff --git a/rigs/icom/id1.c b/rigs/icom/id1.c
index 414541154..d98ca405d 100644
--- a/rigs/icom/id1.c
+++ b/rigs/icom/id1.c
@@ -67,7 +67,7 @@ static struct icom_priv_caps id1_priv_caps =
     id1_ts_sc_list
 };
 
-const struct rig_caps id1_caps =
+struct rig_caps id1_caps =
 {
     RIG_MODEL(RIG_MODEL_ICID1),
     .model_name = "IC ID-1",
diff --git a/rigs/icom/id31.c b/rigs/icom/id31.c
index d243b4af3..3de602f9d 100644
--- a/rigs/icom/id31.c
+++ b/rigs/icom/id31.c
@@ -75,7 +75,7 @@ static struct icom_priv_caps id31_priv_caps =
     1,      /* no XCHG */
 };
 
-const struct rig_caps id31_caps =
+struct rig_caps id31_caps =
 {
     RIG_MODEL(RIG_MODEL_ID31),
     .model_name = "ID-31",
diff --git a/rigs/icom/id4100.c b/rigs/icom/id4100.c
index a126a909b..c04c9ec55 100644
--- a/rigs/icom/id4100.c
+++ b/rigs/icom/id4100.c
@@ -79,7 +79,7 @@ static struct icom_priv_caps id4100_priv_caps =
     1,      /* no XCHG */
 };
 
-const struct rig_caps id4100_caps =
+struct rig_caps id4100_caps =
 {
     RIG_MODEL(RIG_MODEL_ID4100),
     .model_name = "ID-4100",
diff --git a/rigs/icom/id51.c b/rigs/icom/id51.c
index 13fe98e01..729312a85 100644
--- a/rigs/icom/id51.c
+++ b/rigs/icom/id51.c
@@ -82,7 +82,7 @@ static struct icom_priv_caps id51_priv_caps =
     1,      /* no XCHG */
 };
 
-const struct rig_caps id51_caps =
+struct rig_caps id51_caps =
 {
     RIG_MODEL(RIG_MODEL_ID51),
     .model_name = "ID-51",
diff --git a/rigs/icom/id5100.c b/rigs/icom/id5100.c
index 637fe7afc..32122a3aa 100644
--- a/rigs/icom/id5100.c
+++ b/rigs/icom/id5100.c
@@ -27,6 +27,12 @@
 #include "frame.h"
 #include "misc.h"
 
+enum
+{
+    MAIN_ON_LEFT,
+    MAIN_ON_RIGHT
+};
+
 /*
  * Specs and protocol details comes from the chapter 13 of ID-5100_Full-Inst_Manual.pdf
  *
@@ -65,6 +71,286 @@
 
 #define ID5100_PARM_ALL RIG_PARM_NONE
 
+int id5100_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo);
+
+int id5100_set_vfo(RIG *rig, vfo_t vfo)
+{
+    struct rig_state *rs = &rig->state;
+    struct icom_priv_data *priv = (struct icom_priv_data *) rs->priv;
+    unsigned char ackbuf[MAXFRAMELEN];
+    int ack_len = sizeof(ackbuf), retval;
+
+    ENTERFUNC;
+
+    if (vfo == RIG_VFO_CURR) { vfo = rig->state.current_vfo; }
+
+    // if user requests VFOA/B we automatically turn of dual watch mode
+    // if user requests  Main/Sub we automatically turn on dual watch mode
+    // hopefully this is a good idea and just prevents users/clients from having set the mode themselves
+#if 0
+
+    if (vfo == RIG_VFO_A || vfo == RIG_VFO_B)
+    {
+        // and 0x25 works in this mode
+        priv->x25cmdfails = 1;
+
+        if (priv->dual_watch)
+        {
+            // then we need to turn off dual watch
+            if (RIG_OK != (retval = icom_set_func(rig, RIG_VFO_CURR, RIG_FUNC_DUAL_WATCH,
+                                                  0)))
+            {
+                RETURNFUNC2(retval);
+            }
+
+            priv->dual_watch = 0;
+        }
+    }
+    else if (vfo == RIG_VFO_MAIN || vfo == RIG_VFO_SUB)
+    {
+        // x25 does not work in DUAL_WATCH mode
+        priv->x25cmdfails = 1;
+
+        if (priv->dual_watch == 0)
+        {
+            if (RIG_OK != (retval = icom_set_func(rig, RIG_VFO_CURR, RIG_FUNC_DUAL_WATCH,
+                                                  1)))
+            {
+                RETURNFUNC2(retval);
+            }
+
+            priv->dual_watch = 1;
+        }
+    }
+
+#endif
+
+    int myvfo = S_MAIN;
+    priv->dual_watch_main_sub = MAIN_ON_LEFT;
+    rig->state.current_vfo = RIG_VFO_A;
+
+    if (vfo == RIG_VFO_B || vfo == RIG_VFO_SUB)
+    {
+        myvfo = S_SUB;
+        priv->dual_watch_main_sub = MAIN_ON_RIGHT;
+        rig->state.current_vfo = RIG_VFO_B;
+    }
+
+    if (RIG_OK != (retval = icom_transaction(rig, C_SET_VFO, myvfo, NULL, 0, ackbuf,
+                            &ack_len)))
+    {
+        RETURNFUNC2(retval);
+    }
+
+    return retval;
+}
+
+
+int id5100_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
+{
+    int cmd = C_SET_FREQ;
+    int subcmd = -1;
+    unsigned char freqbuf[MAXFRAMELEN];
+    int freq_len = 5;
+    int retval;
+    struct rig_state *rs = &rig->state;
+    //struct icom_priv_data *priv = (struct icom_priv_data *) rs->priv;
+
+    vfo_t currvfo = rig->state.current_vfo;
+
+    if (vfo == RIG_VFO_CURR) { vfo = rig->state.current_vfo; }
+
+    if (rs->dual_watch == 0 && (vfo == RIG_VFO_MAIN || vfo == RIG_VFO_SUB)) { id5100_set_split_vfo(rig, RIG_VFO_SUB, 1, RIG_VFO_MAIN); }
+
+    if (rs->dual_watch == 1 && (vfo == RIG_VFO_A || vfo == RIG_VFO_B)) { id5100_set_split_vfo(rig, RIG_VFO_A, 0, RIG_VFO_A); }
+
+    if (vfo != currvfo) { id5100_set_vfo(rig, vfo); }
+
+    rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): vfo=%s\n", __func__, __LINE__,
+              rig_strvfo(vfo));
+
+    to_bcd(freqbuf, freq, freq_len * 2);
+    retval = icom_transaction(rig, cmd, subcmd, freqbuf, freq_len, NULL,
+                              NULL);
+
+    if (vfo != currvfo) { id5100_set_vfo(rig, currvfo); }
+
+    if (retval != RIG_OK)
+    {
+        rig_debug(RIG_DEBUG_ERR, "%s: set_freq failed: %s\n", __func__,
+                  rigerror(retval));
+        return retval;
+    }
+
+    return RIG_OK;
+}
+
+
+static int id5100_get_freq2(RIG *rig, vfo_t vfo, freq_t *freq)
+{
+    unsigned char freqbuf[MAXFRAMELEN];
+    int freq_len = 5;
+    int retval;
+    int freqbuf_offset = 1;
+    int cmd = 0x03;
+    int subcmd = -1;
+    rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): vfo=%s\n", __func__, __LINE__,
+              rig_strvfo(vfo));
+    retval = icom_transaction(rig, cmd, subcmd, NULL, 0, freqbuf, &freq_len);
+
+    if (retval != RIG_OK)
+    {
+        return -retval;
+    }
+
+    *freq = from_bcd(freqbuf + freqbuf_offset, freq_len * 2);
+    return RIG_OK;
+}
+
+int id5100_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
+{
+    struct rig_state *rs = &rig->state;
+    struct icom_priv_data *priv = (struct icom_priv_data *) rs->priv;
+    int retval;
+
+    vfo_t currvfo = rig->state.current_vfo;
+
+    // we automatically dual_watchy based on requested VFO
+    if (rs->dual_watch == 0 && (vfo == RIG_VFO_MAIN || vfo == RIG_VFO_SUB)) { id5100_set_split_vfo(rig, RIG_VFO_SUB, 1, RIG_VFO_MAIN); }
+
+    if (rs->dual_watch == 1 && (vfo == RIG_VFO_A || vfo == RIG_VFO_B)) { id5100_set_split_vfo(rig, RIG_VFO_A, 0, RIG_VFO_A); }
+
+    if (rs->dual_watch) // dual watch is different
+    {
+        rig_debug(RIG_DEBUG_VERBOSE, "%s: Dual watch is on\n", __func__);
+
+        if (priv->dual_watch_main_sub == MAIN_ON_LEFT
+                || currvfo == RIG_VFO_A) // Then Main is on left
+        {
+            rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): Main on left\n", __func__, __LINE__);
+
+            if (vfo == RIG_VFO_A || vfo == RIG_VFO_MAIN)
+            {
+                rig_debug(RIG_DEBUG_ERR, "%s: Method#1\n", __func__);
+                id5100_set_vfo(rig, RIG_VFO_A);
+                retval = id5100_get_freq2(rig, vfo, freq);
+                id5100_set_vfo(rig, RIG_VFO_B);
+                return retval;
+            }
+            else // Sub read -- don't need to do anything as it's on the left side
+            {
+                rig_debug(RIG_DEBUG_ERR, "%s: Method#2\n", __func__);
+                retval = id5100_get_freq2(rig, vfo, freq);
+                return retval;
+            }
+        }
+
+        else //
+        {
+            rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): Sub on left\n", __func__, __LINE__);
+
+            if (currvfo == RIG_VFO_B && (vfo == RIG_VFO_B || vfo == RIG_VFO_SUB))
+            {
+                rig_debug(RIG_DEBUG_ERR, "%s: Method#3\n", __func__);
+                id5100_set_vfo(rig, RIG_VFO_MAIN);
+                retval = id5100_get_freq2(rig, vfo, freq);
+                id5100_set_vfo(rig, RIG_VFO_SUB);
+                return retval;
+            }
+            else
+            {
+                rig_debug(RIG_DEBUG_ERR, "%s: Method#4\n", __func__);
+                retval = id5100_get_freq2(rig, vfo, freq);
+                return retval;
+            }
+        }
+    }
+    else // not dual watch
+    {
+        if (currvfo != vfo)
+        {
+            id5100_set_vfo(rig, vfo);
+        }
+
+        retval = id5100_get_freq2(rig, vfo, freq);
+
+        if (currvfo != vfo)
+        {
+            id5100_set_vfo(rig, currvfo);
+        }
+
+        return retval;
+    }
+
+#if 0
+    else if ((vfo == RIG_VFOvfo == RIG_VFO_SUB
+              && rs->dual_watch_main_sub == MAIN_ON_RIGHT)
+{
+    rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): Sub/A vfo=%s\n", __func__, __LINE__,
+              rig_strvfo(vfo));
+        *freq = rig->state.cache.freqSubA;
+        int cache_ms_freq, cache_ms_mode, cache_ms_width;
+        pbwidth_t width;
+        freq_t tfreq;
+        rmode_t mode;
+        retval = rig_get_cache(rig, RIG_VFO_SUB, &tfreq, &cache_ms_freq, &mode,
+                               &cache_ms_mode,
+    }
+             else
+    {
+        rig_debug(RIG_DEBUG_VERBOSE, "%s: Dual watch is off\n", __func__);
+    }
+    if (vfo == RIG_VFO_CURR) { vfo = rig->state.current_vfo; }
+if (vfo == RIG_VFO_MAIN && priv->dual_watch_main_sub == MAIN_ON_LEFT)
+{
+    rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): Main/A vfo=%s\n", __func__, __LINE__,
+              rig_strvfo(vfo));
+    }
+    if (priv->dual_watch_main_sub == MAIN_ON_LEFT || currvfo == RIG_VFO_A
+            || currvfo == RIG_VFO_MAIN) // Then Main is on left
+{
+    rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): Main on left\n", __func__, __LINE__);
+
+        if (vfo == RIG_VFO_A || vfo == RIG_VFO_MAIN)
+        {
+            return id5100_get_freq2(rig, vfo, freq);
+        }
+        else
+        {
+            id5100_set_vfo(rig, RIG_VFO_B);
+            hl_usleep(50 * 1000);
+            retval = id5100_get_freq2(rig, vfo, freq);
+            id5100_set_vfo(rig, RIG_VFO_A);
+            return retval;
+        }
+    }
+    else // MAIN_ON_RIGHT
+    {
+        rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): Sub on left\n", __func__, __LINE__);
+
+        if (vfo == RIG_VFO_B || vfo == RIG_VFO_SUB)
+        {
+            if (rs->dual_watch)
+            {
+                id5100_set_vfo(rig, RIG_VFO_A);
+            }
+
+            id5100_get_freq2(rig, vfo, freq);
+
+            if (rs->dual_watch)
+            {
+                id5100_set_vfo(rig, RIG_VFO_B);
+            }
+        }
+        else
+        {
+            retval = id5100_get_freq2(rig, vfo, freq);
+            return retval;
+        }
+    }
+#endif
+    return RIG_OK;
+}
 
 /*
  * FIXME: real measurement
@@ -136,80 +422,39 @@ int id5100_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
     return RIG_OK;
 }
 
-int id5100_set_vfo(RIG *rig, vfo_t vfo)
-{
-    unsigned char ackbuf[MAXFRAMELEN];
-    int ack_len = sizeof(ackbuf), retval;
-    struct rig_state *rs = &rig->state;
-    struct icom_priv_data *priv = (struct icom_priv_data *) rs->priv;
-
-    ENTERFUNC;
-
-    if (vfo == RIG_VFO_CURR) { vfo = rig->state.current_vfo; }
-
-    // if user requests VFOA/B we automatically turn of dual watch mode
-    // if user requests  Main/Sub we automatically turn on dual watch mode
-    // hopefully this is a good idea and just prevents users/clients from having set the mode themselves
-
-    if (vfo == RIG_VFO_A || vfo == RIG_VFO_B)
-    {
-        // and 0x25 works in this mode
-        priv->x25cmdfails = 1;
-
-        if (priv->dual_watch)
-        {
-            // then we need to turn off dual watch
-            if (RIG_OK != (retval = icom_set_func(rig, RIG_VFO_CURR, RIG_FUNC_DUAL_WATCH,
-                                                  0)))
-            {
-                RETURNFUNC2(retval);
-            }
-            priv->dual_watch = 0;
-        }
-    }
-    else if (vfo == RIG_VFO_MAIN || vfo == RIG_VFO_SUB)
-    {
-        // x25 does not work in DUAL_WATCH mode
-        priv->x25cmdfails = 1;
-
-        if (priv->dual_watch == 0)
-        {
-            if (RIG_OK != (retval = icom_set_func(rig, RIG_VFO_CURR, RIG_FUNC_DUAL_WATCH,
-                                                  1)))
-            {
-                RETURNFUNC2(retval);
-            }
-            priv->dual_watch = 1;
-        }
-    }
-
-    int myvfo = S_MAIN;
-
-    if (vfo == RIG_VFO_B || vfo == RIG_VFO_SUB)
-    {
-        myvfo = S_SUB;
-    }
-
-    if (RIG_OK != (retval = icom_transaction(rig, C_SET_VFO, myvfo, NULL, 0, ackbuf,
-                            &ack_len)))
-    {
-        RETURNFUNC2(retval);
-    }
-
-    return retval;
-}
-
 int id5100_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
 {
+    struct rig_state *rs = &rig->state;
+    struct icom_priv_data *priv = (struct icom_priv_data *) rs->priv;
     int retval;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called vfo=%s\n", __func__, rig_strvfo(vfo));
 
-    // ID5100 puts tx on Main an rx on Sub
+    if (rs->dual_watch == 0)
+    {
+        if (RIG_OK != (retval = icom_set_func(rig, RIG_VFO_CURR, RIG_FUNC_DUAL_WATCH,
+                                              split)))
+        {
+            RETURNFUNC2(retval);
+        }
+
+        rs->dual_watch = split;
+
+        if (split == 0) { rig_set_vfo(rig, RIG_VFO_A); }
+
+        return RIG_OK;
+    }
+
+    priv->dual_watch_main_sub = MAIN_ON_LEFT;
+
+    // ID5100 puts tx on Main and rx on Left side
+    // So we put Main on right side to match gpredict positions
     if (tx_vfo == RIG_VFO_A || tx_vfo == RIG_VFO_MAIN)
     {
         // we must set RX vfo to SUB
-        retval = rig_set_vfo(rig, RIG_VFO_SUB);
+        retval = id5100_set_vfo(rig, RIG_VFO_SUB);
+        rs->current_vfo = RIG_VFO_SUB;
+        priv->dual_watch_main_sub = MAIN_ON_RIGHT;
     }
     else
     {
@@ -222,24 +467,58 @@ int id5100_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
     return retval;
 }
 
-int id5100_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
+
+int id5100_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
 {
-    unsigned char ackbuf[MAXFRAMELEN];
-    int ack_len = sizeof(ackbuf), retval;
-    int fct_cn, fct_sc;       /* Command Number, Subcommand */
-    unsigned char fctbuf[MAXFRAMELEN];
-    int fct_len = 0;
+    int freq_len = 5;
+    int retval;
+    int cmd;
+    int subcmd;
+    unsigned char freqbuf[MAXFRAMELEN];
 
-    const struct icom_priv_caps *priv_caps = rig->caps->priv;
-    const struct cmdparams *extcmds = priv_caps->extcmds;
-    int i;
 
-    rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
     ENTERFUNC;
 
-    value_t value;
-    RETURNFUNC(icom_get_func(rig, vfo, func, status));
+    to_bcd(freqbuf, tx_freq, freq_len * 2);
+
+    cmd = 0x0;
+    subcmd = -1;
+    // Main is always TX
+    retval = icom_transaction(rig, cmd, subcmd, freqbuf, freq_len, NULL, NULL);
+
+    RETURNFUNC(retval);
 }
+
+int id5100_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq)
+{
+    int retval;
+    struct rig_state *rs = &rig->state;
+    struct icom_priv_data *priv = (struct icom_priv_data *) rs->priv;
+    vfo_t currvfo;
+
+    rig_debug(RIG_DEBUG_VERBOSE, "%s(%d): vfo=%s\n", __func__, __LINE__,
+              rig_strvfo(vfo));
+    currvfo = rig->state.current_vfo;
+#if 0
+
+    if (priv->dual_watch_main_sub == MAIN_ON_LEFT && (currvfo == RIG_VFO_MAIN
+            || currvfo == RIG_VFO_A) && vfo == RIG_VFO_TX)
+    {
+        rig_set_vfo(rig, RIG_VFO_SUB);
+        retval = rig_get_freq(rig, RIG_VFO_CURR, tx_freq);
+        rig_set_vfo(rig, RIG_VFO_MAIN);
+    }
+    else
+#endif
+    {
+        retval = rig_get_freq(rig, RIG_VFO_CURR, tx_freq);
+    }
+
+    return retval;
+}
+
+
+
 /*
  */
 static struct icom_priv_caps id5100_priv_caps =
@@ -250,12 +529,12 @@ static struct icom_priv_caps id5100_priv_caps =
     .dualwatch_split = 1
 };
 
-const struct rig_caps id5100_caps =
+struct rig_caps id5100_caps =
 {
     RIG_MODEL(RIG_MODEL_ID5100),
     .model_name = "ID-5100",
     .mfg_name =  "Icom",
-    .version =  BACKEND_VER ".7",
+    .version =  BACKEND_VER ".8",
     .copyright =  "LGPL",
     .status =  RIG_STATUS_STABLE,
     .rig_type =  RIG_TYPE_MOBILE,
@@ -350,19 +629,22 @@ const struct rig_caps id5100_caps =
     .rig_open =  icom_rig_open,
     .rig_close =  icom_rig_close,
 
-    .set_freq =  icom_set_freq,
-    .get_freq =  icom_get_freq,
+    .set_freq =  id5100_set_freq,
+    .get_freq =  id5100_get_freq,
+    .get_split_freq = id5100_get_split_freq,
+    .set_split_freq = id5100_set_split_freq,
     .set_mode =  id5100_set_mode,
     .get_mode =  id5100_get_mode,
     .set_vfo =  id5100_set_vfo,
     .set_split_vfo = id5100_set_split_vfo,
+    .set_split_freq = id5100_set_split_freq,
 
     .set_powerstat = icom_set_powerstat,
     //.get_powerstat = icom_get_powerstat, // ID-5100 cannot get power status
     .decode_event =  icom_decode_event,
 
     .set_func =  icom_set_func,
-    .get_func =  id5100_get_func,
+    .get_func =  icom_get_func,
     .set_level =  icom_set_level,
     .get_level =  icom_get_level,
     .set_parm =  icom_set_parm,
diff --git a/rigs/icom/omni.c b/rigs/icom/omni.c
index 7dd077b85..14eb87af3 100644
--- a/rigs/icom/omni.c
+++ b/rigs/icom/omni.c
@@ -59,7 +59,7 @@ static struct icom_priv_caps omnivip_priv_caps =
     NULL    /* TODO */
 };
 
-const struct rig_caps omnivip_caps =
+struct rig_caps omnivip_caps =
 {
     RIG_MODEL(RIG_MODEL_OMNIVIP),
     .model_name = "Omni VI Plus",
diff --git a/rigs/icom/os456.c b/rigs/icom/os456.c
index 21bcfb3bd..cc9dc4aaf 100644
--- a/rigs/icom/os456.c
+++ b/rigs/icom/os456.c
@@ -68,7 +68,7 @@ static struct icom_priv_caps os456_priv_caps =
     .settle_time = 20,
 };
 
-const struct rig_caps os456_caps =
+struct rig_caps os456_caps =
 {
     RIG_MODEL(RIG_MODEL_OS456),
     .model_name = "OptoScan456",
diff --git a/rigs/icom/os535.c b/rigs/icom/os535.c
index df4bd61cb..26575c4d8 100644
--- a/rigs/icom/os535.c
+++ b/rigs/icom/os535.c
@@ -61,7 +61,7 @@ static struct icom_priv_caps os535_priv_caps =
     .settle_time = 12,
 };
 
-const struct rig_caps os535_caps =
+struct rig_caps os535_caps =
 {
     RIG_MODEL(RIG_MODEL_OS535),
     .model_name = "OptoScan535",
diff --git a/rigs/icom/perseus.c b/rigs/icom/perseus.c
index 095a786d4..65b5a9c47 100644
--- a/rigs/icom/perseus.c
+++ b/rigs/icom/perseus.c
@@ -71,7 +71,7 @@ static struct icom_priv_caps perseus_priv_caps =
  * PERSEUS Receiver CAT Interface Reference Manual (Revision EN03) :
  *  http://microtelecom.it/perseus/PERSEUS_CI-V_Interface-EN03.pdf
  */
-const struct rig_caps perseus_caps =
+struct rig_caps perseus_caps =
 {
     RIG_MODEL(RIG_MODEL_PERSEUS),
     .model_name = "Perseus",
diff --git a/rigs/icom/xiegu.c b/rigs/icom/xiegu.c
index 549be231f..6871c4f3a 100644
--- a/rigs/icom/xiegu.c
+++ b/rigs/icom/xiegu.c
@@ -145,7 +145,7 @@ static struct icom_priv_caps x108g_priv_caps =
 };
 
 
-const struct rig_caps x108g_caps =
+struct rig_caps x108g_caps =
 {
     RIG_MODEL(RIG_MODEL_X108G),
     .model_name = "X108G",
@@ -321,7 +321,7 @@ const struct rig_caps x108g_caps =
     .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
 };
 
-const struct rig_caps x6100_caps =
+struct rig_caps x6100_caps =
 {
     RIG_MODEL(RIG_MODEL_X6100),
     .model_name = "X6100",
@@ -497,7 +497,7 @@ const struct rig_caps x6100_caps =
     .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
 };
 
-const struct rig_caps g90_caps =
+struct rig_caps g90_caps =
 {
     RIG_MODEL(RIG_MODEL_G90),
     .model_name = "G90",
@@ -673,7 +673,7 @@ const struct rig_caps g90_caps =
     .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
 };
 
-const struct rig_caps x5105_caps =
+struct rig_caps x5105_caps =
 {
     RIG_MODEL(RIG_MODEL_X5105),
     .model_name = "X5105",
diff --git a/rigs/jrc/jrc.h b/rigs/jrc/jrc.h
index ef8d80a4d..e494a3499 100644
--- a/rigs/jrc/jrc.h
+++ b/rigs/jrc/jrc.h
@@ -64,11 +64,11 @@ int jrc_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op);
 int jrc_scan(RIG *rig, vfo_t vfo, scan_t scan, int ch);
 int jrc_decode_event(RIG *rig);
 
-extern const struct rig_caps nrd535_caps;
-extern const struct rig_caps nrd545_caps;
-extern const struct rig_caps nrd525_caps;
-extern const struct rig_caps jst145_caps;
-extern const struct rig_caps jst245_caps;
+extern struct rig_caps nrd535_caps;
+extern struct rig_caps nrd545_caps;
+extern struct rig_caps nrd525_caps;
+extern struct rig_caps jst145_caps;
+extern struct rig_caps jst245_caps;
 
 
 #endif /* _JRC_H */
diff --git a/rigs/jrc/jst145.c b/rigs/jrc/jst145.c
index b316b6db0..7f36b80a6 100644
--- a/rigs/jrc/jst145.c
+++ b/rigs/jrc/jst145.c
@@ -73,7 +73,7 @@ struct jst145_priv_data
  * JST-145 rig capabilities.
  *
  */
-const struct rig_caps jst145_caps =
+struct rig_caps jst145_caps =
 {
     RIG_MODEL(RIG_MODEL_JST145),
     .model_name = "JST-145",
@@ -174,7 +174,7 @@ const struct rig_caps jst145_caps =
  * JST-245 rig capabilities.
  *
  */
-const struct rig_caps jst245_caps =
+struct rig_caps jst245_caps =
 {
     RIG_MODEL(RIG_MODEL_JST245),
     .model_name = "JST-245",
diff --git a/rigs/jrc/nrd525.c b/rigs/jrc/nrd525.c
index 2bd6aaf64..39213c5cd 100644
--- a/rigs/jrc/nrd525.c
+++ b/rigs/jrc/nrd525.c
@@ -54,7 +54,7 @@ static int nrd525_set_mem(RIG *rig, vfo_t vfo, int ch);
  * NRD-525 rig capabilities.
  *
  */
-const struct rig_caps nrd525_caps =
+struct rig_caps nrd525_caps =
 {
     RIG_MODEL(RIG_MODEL_NRD525),
     .model_name = "NRD-525",
diff --git a/rigs/jrc/nrd535.c b/rigs/jrc/nrd535.c
index aae04ff9e..e5eabb598 100644
--- a/rigs/jrc/nrd535.c
+++ b/rigs/jrc/nrd535.c
@@ -89,7 +89,7 @@ static const struct jrc_priv_caps nrd535_priv_caps =
  * NRD-535 rig capabilities.
  *
  */
-const struct rig_caps nrd535_caps =
+struct rig_caps nrd535_caps =
 {
     RIG_MODEL(RIG_MODEL_NRD535),
     .model_name = "NRD-535D",
diff --git a/rigs/jrc/nrd545.c b/rigs/jrc/nrd545.c
index 5e3a35dda..60ba7604f 100644
--- a/rigs/jrc/nrd545.c
+++ b/rigs/jrc/nrd545.c
@@ -87,7 +87,7 @@ static const struct jrc_priv_caps nrd545_priv_caps =
  * NRD-545 rig capabilities.
  *
  */
-const struct rig_caps nrd545_caps =
+struct rig_caps nrd545_caps =
 {
     RIG_MODEL(RIG_MODEL_NRD545),
     .model_name = "NRD-545 DSP",
diff --git a/rigs/kachina/505dsp.c b/rigs/kachina/505dsp.c
index 6c5fe45fd..36e6ad37b 100644
--- a/rigs/kachina/505dsp.c
+++ b/rigs/kachina/505dsp.c
@@ -53,7 +53,7 @@
  * TODO:
  *  - so many ...
  */
-const struct rig_caps k505dsp_caps =
+struct rig_caps k505dsp_caps =
 {
     RIG_MODEL(RIG_MODEL_505DSP),
     .model_name = "505DSP",
diff --git a/rigs/kachina/kachina.h b/rigs/kachina/kachina.h
index 05fa3eb9c..4fafe56a1 100644
--- a/rigs/kachina/kachina.h
+++ b/rigs/kachina/kachina.h
@@ -30,7 +30,7 @@ int kachina_set_freq(RIG *rig, vfo_t vfo, freq_t freq);
 int kachina_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width);
 int kachina_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
 
-extern const struct rig_caps k505dsp_caps;
+extern struct rig_caps k505dsp_caps;
 
 
 #endif /* _KACHINA_H */
diff --git a/rigs/kenwood/flex6xxx.c b/rigs/kenwood/flex6xxx.c
index 0510ceac8..274404978 100644
--- a/rigs/kenwood/flex6xxx.c
+++ b/rigs/kenwood/flex6xxx.c
@@ -1207,7 +1207,7 @@ int powersdr_get_parm(RIG *rig, setting_t parm, value_t *val)
 /*
  * F6K rig capabilities.
  */
-const struct rig_caps f6k_caps =
+struct rig_caps f6k_caps =
 {
     RIG_MODEL(RIG_MODEL_F6K),
     .model_name =       "6xxx",
@@ -1340,7 +1340,7 @@ const struct rig_caps f6k_caps =
 /*
  * PowerSDR rig capabilities.
  */
-const struct rig_caps powersdr_caps =
+struct rig_caps powersdr_caps =
 {
     RIG_MODEL(RIG_MODEL_POWERSDR),
     .model_name =       "PowerSDR/Thetis",
diff --git a/rigs/kenwood/k2.c b/rigs/kenwood/k2.c
index bca431dde..7d8f4d6d7 100644
--- a/rigs/kenwood/k2.c
+++ b/rigs/kenwood/k2.c
@@ -113,7 +113,7 @@ int k2_pop_fw_lst(RIG *rig, const char *cmd);
  * Part of info comes from http://www.elecraft.com/K2_Manual_Download_Page.htm#K2
  * look for KIO2 Programmer's Reference PDF
  */
-const struct rig_caps k2_caps =
+struct rig_caps k2_caps =
 {
     RIG_MODEL(RIG_MODEL_K2),
     .model_name =       "K2",
diff --git a/rigs/kenwood/k3.c b/rigs/kenwood/k3.c
index c81c3550f..c6f9a88fc 100644
--- a/rigs/kenwood/k3.c
+++ b/rigs/kenwood/k3.c
@@ -191,7 +191,7 @@ int k4_stop_morse(RIG *rig, vfo_t vfo);
  * look for K3 Programmer's Reference PDF
  *
  */
-const struct rig_caps k3_caps =
+struct rig_caps k3_caps =
 {
     RIG_MODEL(RIG_MODEL_K3),
     .model_name =       "K3",
@@ -347,7 +347,7 @@ const struct rig_caps k3_caps =
     .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
 };
 
-const struct rig_caps k3s_caps =
+struct rig_caps k3s_caps =
 {
     RIG_MODEL(RIG_MODEL_K3S),
     .model_name =       "K3S",
@@ -504,7 +504,7 @@ const struct rig_caps k3s_caps =
 };
 
 // How similar is this to the K3S?
-const struct rig_caps k4_caps =
+struct rig_caps k4_caps =
 {
     RIG_MODEL(RIG_MODEL_K4),
     .model_name =       "K4",
@@ -665,7 +665,7 @@ const struct rig_caps k4_caps =
     .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
 };
 
-const struct rig_caps kx3_caps =
+struct rig_caps kx3_caps =
 {
     RIG_MODEL(RIG_MODEL_KX3),
     .model_name =       "KX3",
@@ -820,7 +820,7 @@ const struct rig_caps kx3_caps =
     .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
 };
 
-const struct rig_caps kx2_caps =
+struct rig_caps kx2_caps =
 {
     RIG_MODEL(RIG_MODEL_KX2),
     .model_name =       "KX2",
diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c
index 9ff8b125c..605bdcb51 100644
--- a/rigs/kenwood/kenwood.c
+++ b/rigs/kenwood/kenwood.c
@@ -4371,7 +4371,7 @@ int kenwood_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
  */
 int kenwood_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone)
 {
-    const struct rig_caps *caps;
+    struct rig_caps *caps;
     char tonebuf[16];
     int i;
 
@@ -4400,7 +4400,7 @@ int kenwood_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone)
 
 int kenwood_set_ctcss_tone_tn(RIG *rig, vfo_t vfo, tone_t tone)
 {
-    const struct rig_caps *caps = rig->caps;
+    struct rig_caps *caps = rig->caps;
     char buf[16];
     int i;
 
@@ -4461,7 +4461,7 @@ int kenwood_set_ctcss_tone_tn(RIG *rig, vfo_t vfo, tone_t tone)
 int kenwood_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
 {
     struct kenwood_priv_data *priv = rig->state.priv;
-    const struct rig_caps *caps;
+    struct rig_caps *caps;
     char tonebuf[3];
     int i, retval;
     unsigned int tone_idx;
@@ -4543,7 +4543,7 @@ int kenwood_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
 
 int kenwood_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone)
 {
-    const struct rig_caps *caps = rig->caps;
+    struct rig_caps *caps = rig->caps;
     char buf[16];
     int i;
 
@@ -4599,7 +4599,7 @@ int kenwood_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone)
 
 int kenwood_get_ctcss_sql(RIG *rig, vfo_t vfo, tone_t *tone)
 {
-    const struct rig_caps *caps;
+    struct rig_caps *caps;
     char cmd[4];
     char tonebuf[6];
     int offs;
diff --git a/rigs/kenwood/kenwood.h b/rigs/kenwood/kenwood.h
index 6d2062dc1..ec88254f8 100644
--- a/rigs/kenwood/kenwood.h
+++ b/rigs/kenwood/kenwood.h
@@ -266,63 +266,63 @@ int get_kenwood_level(RIG *rig, const char *cmd, float *fval, int *ival);
 int get_kenwood_func(RIG *rig, const char *cmd, int *status);
 int get_kenwood_meter_reading(RIG *rig, char meter, int *pips);
 
-extern const struct rig_caps ts950s_caps;
-extern const struct rig_caps ts950sdx_caps;
-extern const struct rig_caps ts50s_caps;
-extern const struct rig_caps ts140_caps;
-extern const struct rig_caps ts450s_caps;
-extern const struct rig_caps ts570d_caps;
-extern const struct rig_caps ts570s_caps;
-extern const struct rig_caps ts680s_caps;
-extern const struct rig_caps ts690s_caps;
-extern const struct rig_caps ts790_caps;
-extern const struct rig_caps ts850_caps;
-extern const struct rig_caps ts870s_caps;
-extern const struct rig_caps ts930_caps;
-extern const struct rig_caps ts2000_caps;
-extern const struct rig_caps k2_caps;
-extern const struct rig_caps k3_caps;
-extern const struct rig_caps k3s_caps;
-extern const struct rig_caps kx2_caps;
-extern const struct rig_caps kx3_caps;
-extern const struct rig_caps k4_caps;
-extern const struct rig_caps xg3_caps;
-extern const struct rig_caps trc80_caps;
+extern struct rig_caps ts950s_caps;
+extern struct rig_caps ts950sdx_caps;
+extern struct rig_caps ts50s_caps;
+extern struct rig_caps ts140_caps;
+extern struct rig_caps ts450s_caps;
+extern struct rig_caps ts570d_caps;
+extern struct rig_caps ts570s_caps;
+extern struct rig_caps ts680s_caps;
+extern struct rig_caps ts690s_caps;
+extern struct rig_caps ts790_caps;
+extern struct rig_caps ts850_caps;
+extern struct rig_caps ts870s_caps;
+extern struct rig_caps ts930_caps;
+extern struct rig_caps ts2000_caps;
+extern struct rig_caps k2_caps;
+extern struct rig_caps k3_caps;
+extern struct rig_caps k3s_caps;
+extern struct rig_caps kx2_caps;
+extern struct rig_caps kx3_caps;
+extern struct rig_caps k4_caps;
+extern struct rig_caps xg3_caps;
+extern struct rig_caps trc80_caps;
 
-extern const struct rig_caps thd7a_caps;
-extern const struct rig_caps thd72a_caps;
-extern const struct rig_caps thd74_caps;
-extern const struct rig_caps tmd700_caps;
-extern const struct rig_caps thf7a_caps;
-extern const struct rig_caps thf7e_caps;
-extern const struct rig_caps thg71_caps;
-extern const struct rig_caps tmv7_caps;
-extern const struct rig_caps tmv71_caps;
-extern const struct rig_caps tmd710_caps;
+extern struct rig_caps thd7a_caps;
+extern struct rig_caps thd72a_caps;
+extern struct rig_caps thd74_caps;
+extern struct rig_caps tmd700_caps;
+extern struct rig_caps thf7a_caps;
+extern struct rig_caps thf7e_caps;
+extern struct rig_caps thg71_caps;
+extern struct rig_caps tmv7_caps;
+extern struct rig_caps tmv71_caps;
+extern struct rig_caps tmd710_caps;
 
-extern const struct rig_caps ts440_caps;
-extern const struct rig_caps ts940_caps;
-extern const struct rig_caps ts711_caps;
-extern const struct rig_caps ts811_caps;
-extern const struct rig_caps r5000_caps;
+extern struct rig_caps ts440_caps;
+extern struct rig_caps ts940_caps;
+extern struct rig_caps ts711_caps;
+extern struct rig_caps ts811_caps;
+extern struct rig_caps r5000_caps;
 
-extern const struct rig_caps ts480_caps;
-extern const struct rig_caps ts590_caps;
-extern const struct rig_caps ts590sg_caps;
-extern const struct rig_caps thf6a_caps;
+extern struct rig_caps ts480_caps;
+extern struct rig_caps ts590_caps;
+extern struct rig_caps ts590sg_caps;
+extern struct rig_caps thf6a_caps;
 
-extern const struct rig_caps transfox_caps;
+extern struct rig_caps transfox_caps;
 
-extern const struct rig_caps f6k_caps;
-extern const struct rig_caps powersdr_caps;
-extern const struct rig_caps pihpsdr_caps;
-extern const struct rig_caps ts890s_caps;
-extern const struct rig_caps pt8000a_caps;
-extern const struct rig_caps malachite_caps;
-extern const struct rig_caps tx500_caps;
-extern const struct rig_caps sdruno_caps;
-extern const struct rig_caps qrplabs_caps;
-extern const struct rig_caps fx4_caps;
+extern struct rig_caps f6k_caps;
+extern struct rig_caps powersdr_caps;
+extern struct rig_caps pihpsdr_caps;
+extern struct rig_caps ts890s_caps;
+extern struct rig_caps pt8000a_caps;
+extern struct rig_caps malachite_caps;
+extern struct rig_caps tx500_caps;
+extern struct rig_caps sdruno_caps;
+extern struct rig_caps qrplabs_caps;
+extern struct rig_caps fx4_caps;
 
 /* use when not interested in the answer, but want to check its len */
 static int inline kenwood_simple_transaction(RIG *rig, const char *cmd,
diff --git a/rigs/kenwood/pihpsdr.c b/rigs/kenwood/pihpsdr.c
index 5922b5087..d09391b16 100644
--- a/rigs/kenwood/pihpsdr.c
+++ b/rigs/kenwood/pihpsdr.c
@@ -94,7 +94,7 @@ static struct kenwood_priv_caps  ts2000_priv_caps  =
 /*
  * PiHPSDR rig capabilities. (Emulates Kenwood TS-2000)
  */
-const struct rig_caps pihpsdr_caps =
+struct rig_caps pihpsdr_caps =
 {
     RIG_MODEL(RIG_MODEL_HPSDR),
     .model_name = "PiHPSDR",
diff --git a/rigs/kenwood/r5000.c b/rigs/kenwood/r5000.c
index b9041db2c..324ff87b8 100644
--- a/rigs/kenwood/r5000.c
+++ b/rigs/kenwood/r5000.c
@@ -53,7 +53,7 @@ static struct kenwood_priv_caps  r5000_priv_caps  =
  *
  * TODO: scan, get/set_channel, RIT
  */
-const struct rig_caps r5000_caps =
+struct rig_caps r5000_caps =
 {
     RIG_MODEL(RIG_MODEL_R5000),
     .model_name = "R-5000",
diff --git a/rigs/kenwood/th.c b/rigs/kenwood/th.c
index 3a72d5e83..3a2991c45 100644
--- a/rigs/kenwood/th.c
+++ b/rigs/kenwood/th.c
@@ -1392,7 +1392,7 @@ int th_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
 int
 th_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone)
 {
-    const struct rig_caps *caps;
+    struct rig_caps *caps;
     char tonebuf[16];
     int i;
 
@@ -1470,7 +1470,7 @@ th_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
 int
 th_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone)
 {
-    const struct rig_caps *caps;
+    struct rig_caps *caps;
     char tonebuf[16];
     int i;
 
@@ -1552,7 +1552,7 @@ th_get_ctcss_sql(RIG *rig, vfo_t vfo, tone_t *tone)
 int
 th_set_dcs_sql(RIG *rig, vfo_t vfo, tone_t code)
 {
-    const struct rig_caps *caps;
+    struct rig_caps *caps;
     char codebuf[16];
     int i, retval;
 
diff --git a/rigs/kenwood/thd7.c b/rigs/kenwood/thd7.c
index 4a6cb48ba..d8a60aeef 100644
--- a/rigs/kenwood/thd7.c
+++ b/rigs/kenwood/thd7.c
@@ -77,7 +77,7 @@ static struct kenwood_priv_caps  thd7_priv_caps  =
  *
  * http://www.qsl.net/ta1dx/kenwood/thd7kom.htm
  */
-const struct rig_caps thd7a_caps =
+struct rig_caps thd7a_caps =
 {
     RIG_MODEL(RIG_MODEL_THD7A),
     .model_name = "TH-D7A",
diff --git a/rigs/kenwood/thd72.c b/rigs/kenwood/thd72.c
index f53a0a67d..0c138550b 100644
--- a/rigs/kenwood/thd72.c
+++ b/rigs/kenwood/thd72.c
@@ -1644,7 +1644,7 @@ int thd72_get_chan_all_cb(RIG *rig, chan_cb_t chan_cb, rig_ptr_t arg)
 /*
  * th-d72a rig capabilities.
  */
-const struct rig_caps thd72a_caps =
+struct rig_caps thd72a_caps =
 {
     RIG_MODEL(RIG_MODEL_THD72A),
     .model_name = "TH-D72A",
diff --git a/rigs/kenwood/thd74.c b/rigs/kenwood/thd74.c
index a46a892aa..01b5e89b3 100644
--- a/rigs/kenwood/thd74.c
+++ b/rigs/kenwood/thd74.c
@@ -1644,7 +1644,7 @@ int thd74_get_chan_all_cb(RIG *rig, chan_cb_t chan_cb, rig_ptr_t arg)
 /*
  * th-d74 rig capabilities.
  */
-const struct rig_caps thd74_caps =
+struct rig_caps thd74_caps =
 {
     RIG_MODEL(RIG_MODEL_THD74),
     .model_name = "TH-D74",
diff --git a/rigs/kenwood/thf6a.c b/rigs/kenwood/thf6a.c
index 4f1a07bc6..7b1bdacf8 100644
--- a/rigs/kenwood/thf6a.c
+++ b/rigs/kenwood/thf6a.c
@@ -112,7 +112,7 @@ static int thf6a_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op);
  * - set/get_ctcss_tone/sql through set/get_channel() and VR/VW
  * - emulate RIG_FUNC_TONE|RIG_FUNC_TSQL by setting ctcss_tone/sql to 0/non zero?
  */
-const struct rig_caps thf6a_caps =
+struct rig_caps thf6a_caps =
 {
     RIG_MODEL(RIG_MODEL_THF6A),
     .model_name = "TH-F6A",
diff --git a/rigs/kenwood/thf7.c b/rigs/kenwood/thf7.c
index a9f74d276..68520cb39 100644
--- a/rigs/kenwood/thf7.c
+++ b/rigs/kenwood/thf7.c
@@ -106,7 +106,7 @@ static int thf7e_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op);
  * - set/get_ctcss_tone/sql through set/get_channel() and VR/VW
  * - emulate RIG_FUNC_TONE|RIG_FUNC_TSQL by setting ctcss_tone/sql to 0/non zero?
  */
-const struct rig_caps thf7e_caps =
+struct rig_caps thf7e_caps =
 {
     RIG_MODEL(RIG_MODEL_THF7E),
     .model_name = "TH-F7E",
diff --git a/rigs/kenwood/thg71.c b/rigs/kenwood/thg71.c
index 016c1a5cf..57302725c 100644
--- a/rigs/kenwood/thg71.c
+++ b/rigs/kenwood/thg71.c
@@ -80,7 +80,7 @@ static int thg71_set_func(RIG *rig, vfo_t vfo, setting_t func, int status);
  *
  * http://www.iw5edi.com/ham-radio/files/TH-G71_Serial_Protocol.pdf
  */
-const struct rig_caps thg71_caps =
+struct rig_caps thg71_caps =
 {
     RIG_MODEL(RIG_MODEL_THG71),
     .model_name = "TH-G71",
diff --git a/rigs/kenwood/tmd700.c b/rigs/kenwood/tmd700.c
index 5df1ac358..abac90100 100644
--- a/rigs/kenwood/tmd700.c
+++ b/rigs/kenwood/tmd700.c
@@ -88,7 +88,7 @@ static struct kenwood_priv_caps  tmd700_priv_caps  =
  * specs: http://www.geocities.jp/hkwatarin/TM-D700/English/spec.htm
  * protocol: http://www.qsl.net/k/k7jar//pages/D700Cmds.html
  */
-const struct rig_caps tmd700_caps =
+struct rig_caps tmd700_caps =
 {
     RIG_MODEL(RIG_MODEL_TMD700),
     .model_name = "TM-D700",
diff --git a/rigs/kenwood/tmd710.c b/rigs/kenwood/tmd710.c
index 2fdb385aa..07b092ad4 100644
--- a/rigs/kenwood/tmd710.c
+++ b/rigs/kenwood/tmd710.c
@@ -250,7 +250,7 @@ const struct confparams tmd710_ext_levels[] =
     { RIG_CONF_END, NULL, }
 };
 
-const struct rig_caps tmd710_caps =
+struct rig_caps tmd710_caps =
 {
     .rig_model =  RIG_MODEL_TMD710,
     .model_name = "TM-D710(G)",
@@ -408,7 +408,7 @@ const struct rig_caps tmd710_caps =
     .decode_event =  th_decode_event,
 };
 
-const struct rig_caps tmv71_caps =
+struct rig_caps tmv71_caps =
 {
     RIG_MODEL(RIG_MODEL_TMV71),
     .model_name = "TM-V71(A)",
@@ -1367,7 +1367,7 @@ int tmd710_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
     tmd710_fo fo_struct;
     int retval;
 
-    const struct rig_caps *caps;
+    struct rig_caps *caps;
     caps = rig->caps;
 
     rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __func__);
@@ -1421,7 +1421,7 @@ int tmd710_get_ctcss_sql(RIG *rig, vfo_t vfo, tone_t *tone)
     tmd710_fo fo_struct;
     int retval;
 
-    const struct rig_caps *caps;
+    struct rig_caps *caps;
     caps = rig->caps;
 
     rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __func__);
diff --git a/rigs/kenwood/tmv7.c b/rigs/kenwood/tmv7.c
index 92fc8272e..06899d424 100644
--- a/rigs/kenwood/tmv7.c
+++ b/rigs/kenwood/tmv7.c
@@ -89,7 +89,7 @@ static int tmv7_set_channel(RIG *rig, vfo_t vfo, const channel_t *chan);
 /*
  * tm-v7 rig capabilities.
  */
-const struct rig_caps tmv7_caps =
+struct rig_caps tmv7_caps =
 {
     RIG_MODEL(RIG_MODEL_TMV7),
     .model_name = "TM-V7",
diff --git a/rigs/kenwood/transfox.c b/rigs/kenwood/transfox.c
index 289add0d2..ccdafb88d 100644
--- a/rigs/kenwood/transfox.c
+++ b/rigs/kenwood/transfox.c
@@ -63,7 +63,7 @@ static int transfox_get_level(RIG *rig, vfo_t vfo, setting_t level,
  *
  * Part of info comes from http://www.sigfox-system.com/TransFox-FE?lang=en
  */
-const struct rig_caps transfox_caps =
+struct rig_caps transfox_caps =
 {
     RIG_MODEL(RIG_MODEL_TRANSFOX),
     .model_name =       "Transfox",
diff --git a/rigs/kenwood/trc80.c b/rigs/kenwood/trc80.c
index 0b353c055..c6872330d 100644
--- a/rigs/kenwood/trc80.c
+++ b/rigs/kenwood/trc80.c
@@ -60,7 +60,7 @@ static struct kenwood_priv_caps trc80_priv_caps  =
 /*
  * TRC-80/TK-80 rig capabilities.
  */
-const struct rig_caps trc80_caps =
+struct rig_caps trc80_caps =
 {
     RIG_MODEL(RIG_MODEL_TRC80),
     .model_name = "TRC-80",
diff --git a/rigs/kenwood/ts140.c b/rigs/kenwood/ts140.c
index 2fd411591..884f841d0 100644
--- a/rigs/kenwood/ts140.c
+++ b/rigs/kenwood/ts140.c
@@ -76,7 +76,7 @@ static int ts140_set_vfo(RIG *rig, vfo_t vfo)
  *  GW0VNR 09042006
  */
 
-const struct rig_caps ts140_caps =
+struct rig_caps ts140_caps =
 {
     RIG_MODEL(RIG_MODEL_TS140S),
     .model_name = "TS-140S",
diff --git a/rigs/kenwood/ts2000.c b/rigs/kenwood/ts2000.c
index 9e62a0817..134d3bccb 100644
--- a/rigs/kenwood/ts2000.c
+++ b/rigs/kenwood/ts2000.c
@@ -1671,7 +1671,7 @@ int ts2000_set_channel(RIG *rig, vfo_t vfo, const channel_t *chan)
 /*
  * TS-2000 rig capabilities
  */
-const struct rig_caps ts2000_caps =
+struct rig_caps ts2000_caps =
 {
     RIG_MODEL(RIG_MODEL_TS2000),
     .model_name = "TS-2000",
diff --git a/rigs/kenwood/ts440.c b/rigs/kenwood/ts440.c
index cebde83e1..b6c7d9f8d 100644
--- a/rigs/kenwood/ts440.c
+++ b/rigs/kenwood/ts440.c
@@ -53,7 +53,7 @@ static struct kenwood_priv_caps  ts440_priv_caps  =
  * .http = //www.ifrance.fr/clucas/modposte/ts440/mod440.htm
  *
  */
-const struct rig_caps ts440_caps =
+struct rig_caps ts440_caps =
 {
     RIG_MODEL(RIG_MODEL_TS440),
     .model_name = "TS-440S",
diff --git a/rigs/kenwood/ts450s.c b/rigs/kenwood/ts450s.c
index 1a68566a1..6a5a43b4d 100644
--- a/rigs/kenwood/ts450s.c
+++ b/rigs/kenwood/ts450s.c
@@ -117,7 +117,7 @@ int ts450_open(RIG *rig)
  * specs: http://www.qsl.net/sm7vhs/radio/kenwood/ts450/specs.htm
  * infos comes from http://www.cnham.com/ts450/ts_450_ex_control.pdf
  */
-const struct rig_caps ts450s_caps =
+struct rig_caps ts450s_caps =
 {
     RIG_MODEL(RIG_MODEL_TS450S),
     .model_name = "TS-450S",
diff --git a/rigs/kenwood/ts480.c b/rigs/kenwood/ts480.c
index d7f211021..b9208dc13 100644
--- a/rigs/kenwood/ts480.c
+++ b/rigs/kenwood/ts480.c
@@ -1244,7 +1244,7 @@ int qdx_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
  * TS-480 rig capabilities
  * Notice that some rigs share the same functions.
  */
-const struct rig_caps ts480_caps =
+struct rig_caps ts480_caps =
 {
     RIG_MODEL(RIG_MODEL_TS480),
     .model_name = "TS-480",
@@ -1443,7 +1443,7 @@ const struct rig_caps ts480_caps =
  * QRPLabs TS-480 emulation rig capabilities
  * Notice that some rigs share the same functions.
  */
-const struct rig_caps qrplabs_caps =
+struct rig_caps qrplabs_caps =
 {
     RIG_MODEL(RIG_MODEL_QRPLABS),
     .model_name = "QCX/QDX",
@@ -1635,7 +1635,7 @@ const struct rig_caps qrplabs_caps =
  * Hilberling PS8000A TS480 emulation
  * Notice that some rigs share the same functions.
  */
-const struct rig_caps pt8000a_caps =
+struct rig_caps pt8000a_caps =
 {
     RIG_MODEL(RIG_MODEL_PT8000A),
     .model_name = "PT-8000A",
@@ -1806,7 +1806,7 @@ const struct rig_caps pt8000a_caps =
  * SDRPlay SDRUno rig capabilities
  * Notice that some rigs share the same functions.
  */
-const struct rig_caps sdruno_caps =
+struct rig_caps sdruno_caps =
 {
     RIG_MODEL(RIG_MODEL_SDRUNO),
     .model_name = "SDRUno",
@@ -2079,7 +2079,7 @@ int malachite_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
  * Notice that some rigs share the same functions.
  * Also this struct is READONLY!
  */
-const struct rig_caps malachite_caps =
+struct rig_caps malachite_caps =
 {
     RIG_MODEL(RIG_MODEL_MALACHITE),
     .model_name = "DSP",
diff --git a/rigs/kenwood/ts50s.c b/rigs/kenwood/ts50s.c
index 527aaab58..b2c7b1415 100644
--- a/rigs/kenwood/ts50s.c
+++ b/rigs/kenwood/ts50s.c
@@ -46,7 +46,7 @@ static struct kenwood_priv_caps  ts50_priv_caps  =
  *
  * part of infos comes from .http = //www.kenwood.net/
  */
-const struct rig_caps ts50s_caps =
+struct rig_caps ts50s_caps =
 {
     RIG_MODEL(RIG_MODEL_TS50),
     .model_name = "TS-50S",
diff --git a/rigs/kenwood/ts570.c b/rigs/kenwood/ts570.c
index 772599269..6e8df8b64 100644
--- a/rigs/kenwood/ts570.c
+++ b/rigs/kenwood/ts570.c
@@ -896,7 +896,7 @@ int ts570_set_xit(RIG *rig, vfo_t vfo, shortfreq_t rit)
  *
  * part of infos comes from .http = //www.kenwood.net/
  */
-const struct rig_caps ts570s_caps =
+struct rig_caps ts570s_caps =
 {
     RIG_MODEL(RIG_MODEL_TS570S),
     .model_name = "TS-570S",
@@ -1083,7 +1083,7 @@ const struct rig_caps ts570s_caps =
  *
  * part of infos comes from .http = //www.kenwood.net/
  */
-const struct rig_caps ts570d_caps =
+struct rig_caps ts570d_caps =
 {
     RIG_MODEL(RIG_MODEL_TS570D),
     .model_name = "TS-570D",
diff --git a/rigs/kenwood/ts590.c b/rigs/kenwood/ts590.c
index 9a4c1dc48..937b92510 100644
--- a/rigs/kenwood/ts590.c
+++ b/rigs/kenwood/ts590.c
@@ -1567,7 +1567,7 @@ static struct kenwood_priv_caps ts590_priv_caps =
 /**
  * TS-590 rig capabilities
  */
-const struct rig_caps ts590_caps =
+struct rig_caps ts590_caps =
 {
     RIG_MODEL(RIG_MODEL_TS590S),
     .model_name = "TS-590S",
@@ -1765,7 +1765,7 @@ const struct rig_caps ts590_caps =
  * Supposed to be 590S compatible
  * Separate entry allows for customization
  */
-const struct rig_caps fx4_caps =
+struct rig_caps fx4_caps =
 {
     RIG_MODEL(RIG_MODEL_FX4),
     .model_name = "FX4/C/CR/L",
@@ -1959,7 +1959,7 @@ const struct rig_caps fx4_caps =
 /**
  * TS-590SG rig capabilities
  */
-const struct rig_caps ts590sg_caps =
+struct rig_caps ts590sg_caps =
 {
     RIG_MODEL(RIG_MODEL_TS590SG),
     .model_name = "TS-590SG",
diff --git a/rigs/kenwood/ts680.c b/rigs/kenwood/ts680.c
index 5bc778e25..48685eb7e 100644
--- a/rigs/kenwood/ts680.c
+++ b/rigs/kenwood/ts680.c
@@ -76,7 +76,7 @@ static int ts680_set_vfo(RIG *rig, vfo_t vfo)
  *  GW0VNR 09042006
  */
 
-const struct rig_caps ts680s_caps =
+struct rig_caps ts680s_caps =
 {
     RIG_MODEL(RIG_MODEL_TS680S),
     .model_name = "TS-680S",
diff --git a/rigs/kenwood/ts690.c b/rigs/kenwood/ts690.c
index d6179e71c..26a130926 100644
--- a/rigs/kenwood/ts690.c
+++ b/rigs/kenwood/ts690.c
@@ -66,7 +66,7 @@ static struct kenwood_priv_caps  ts690_priv_caps  =
  *  - how to set_split in vfo mode?
  *  - ...
  */
-const struct rig_caps ts690s_caps =
+struct rig_caps ts690s_caps =
 {
     RIG_MODEL(RIG_MODEL_TS690S),
     .model_name = "TS-690S",
diff --git a/rigs/kenwood/ts711.c b/rigs/kenwood/ts711.c
index fd572d720..6c0ebaef9 100644
--- a/rigs/kenwood/ts711.c
+++ b/rigs/kenwood/ts711.c
@@ -93,7 +93,7 @@ ts711_set_vfo(RIG *rig, vfo_t vfo)
 /*
  * ts711 rig capabilities.
  */
-const struct rig_caps ts711_caps =
+struct rig_caps ts711_caps =
 {
     RIG_MODEL(RIG_MODEL_TS711),
     .model_name = "TS-711",
diff --git a/rigs/kenwood/ts790.c b/rigs/kenwood/ts790.c
index 8db9c89df..20d84196f 100644
--- a/rigs/kenwood/ts790.c
+++ b/rigs/kenwood/ts790.c
@@ -63,7 +63,7 @@ static struct kenwood_priv_caps  ts790_priv_caps  =
  *
  * part of infos comes from http://www.kenwood.net/
  */
-const struct rig_caps ts790_caps =
+struct rig_caps ts790_caps =
 {
     RIG_MODEL(RIG_MODEL_TS790),
     .model_name = "TS-790",
diff --git a/rigs/kenwood/ts811.c b/rigs/kenwood/ts811.c
index 00646cfb3..88edac4c1 100644
--- a/rigs/kenwood/ts811.c
+++ b/rigs/kenwood/ts811.c
@@ -79,7 +79,7 @@ ts811_set_vfo(RIG *rig, vfo_t vfo)
 /*
  * ts811 rig capabilities.
  */
-const struct rig_caps ts811_caps =
+struct rig_caps ts811_caps =
 {
     RIG_MODEL(RIG_MODEL_TS811),
     .model_name = "TS-811",
diff --git a/rigs/kenwood/ts850.c b/rigs/kenwood/ts850.c
index 219e64847..f829934ee 100644
--- a/rigs/kenwood/ts850.c
+++ b/rigs/kenwood/ts850.c
@@ -96,7 +96,7 @@ static const struct confparams ts850_ext_parms[] =
 * Notice that some rigs share the same functions.
 * Also this struct is READONLY!
 */
-const struct rig_caps ts850_caps =
+struct rig_caps ts850_caps =
 {
     RIG_MODEL(RIG_MODEL_TS850),
     .model_name = "TS-850",
diff --git a/rigs/kenwood/ts870s.c b/rigs/kenwood/ts870s.c
index da45bff2d..c6ec8ecf6 100644
--- a/rigs/kenwood/ts870s.c
+++ b/rigs/kenwood/ts870s.c
@@ -533,7 +533,7 @@ static int ts870s_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
  *
  * part of infos comes from .http = //www.kenwood.net/
  */
-const struct rig_caps ts870s_caps =
+struct rig_caps ts870s_caps =
 {
     RIG_MODEL(RIG_MODEL_TS870S),
     .model_name = "TS-870S",
diff --git a/rigs/kenwood/ts890s.c b/rigs/kenwood/ts890s.c
index f71d009fb..fdb3695e6 100644
--- a/rigs/kenwood/ts890s.c
+++ b/rigs/kenwood/ts890s.c
@@ -383,7 +383,7 @@ static struct kenwood_priv_caps ts890s_priv_caps =
  * Copied from ts480_caps, many of the values have not been verified.
  * Notice that some rigs share the same functions.
  */
-const struct rig_caps ts890s_caps =
+struct rig_caps ts890s_caps =
 {
     RIG_MODEL(RIG_MODEL_TS890S),
     .model_name = "TS-890S",
diff --git a/rigs/kenwood/ts930.c b/rigs/kenwood/ts930.c
index aa839acb0..4bc8859ed 100644
--- a/rigs/kenwood/ts930.c
+++ b/rigs/kenwood/ts930.c
@@ -48,7 +48,7 @@ static struct kenwood_priv_caps  ts930_priv_caps  =
  *
  * part of infos comes from .http = //www.kenwood.net/
  */
-const struct rig_caps ts930_caps =
+struct rig_caps ts930_caps =
 {
     RIG_MODEL(RIG_MODEL_TS930),
     .model_name = "TS-930",
diff --git a/rigs/kenwood/ts940.c b/rigs/kenwood/ts940.c
index 7fb1b7e55..009691fa1 100644
--- a/rigs/kenwood/ts940.c
+++ b/rigs/kenwood/ts940.c
@@ -73,7 +73,7 @@ static struct kenwood_priv_caps  ts940_priv_caps  =
  *
  * TODO: protocol to be check with manual!
  */
-const struct rig_caps ts940_caps =
+struct rig_caps ts940_caps =
 {
     RIG_MODEL(RIG_MODEL_TS940),
     .model_name = "TS-940S",
diff --git a/rigs/kenwood/ts950.c b/rigs/kenwood/ts950.c
index 79639a36c..69cbfac65 100644
--- a/rigs/kenwood/ts950.c
+++ b/rigs/kenwood/ts950.c
@@ -61,7 +61,7 @@ static struct kenwood_priv_caps  ts950_priv_caps  =
  *
  * Reference: TS-950 series External Control Instruction Manual (1992)
  */
-const struct rig_caps ts950s_caps =
+struct rig_caps ts950s_caps =
 {
     RIG_MODEL(RIG_MODEL_TS950S),
     .model_name = "TS-950S",
@@ -208,7 +208,7 @@ const struct rig_caps ts950s_caps =
 };
 
 
-const struct rig_caps ts950sdx_caps =
+struct rig_caps ts950sdx_caps =
 {
     RIG_MODEL(RIG_MODEL_TS950SDX),
     .model_name = "TS-950SDX",
diff --git a/rigs/kenwood/ts990s.c b/rigs/kenwood/ts990s.c
index 112c3cba3..7445226e1 100644
--- a/rigs/kenwood/ts990s.c
+++ b/rigs/kenwood/ts990s.c
@@ -128,7 +128,7 @@ static struct kenwood_priv_caps  ts990s_priv_caps  =
  *
  * part of infos comes from http://www.kenwood.net/
  */
-const struct rig_caps ts990s_caps =
+struct rig_caps ts990s_caps =
 {
     RIG_MODEL(RIG_MODEL_TS990S),
     .model_name = "TS-990S",
diff --git a/rigs/kenwood/ts990s.h b/rigs/kenwood/ts990s.h
index 9245beac7..4c6b12090 100644
--- a/rigs/kenwood/ts990s.h
+++ b/rigs/kenwood/ts990s.h
@@ -24,6 +24,6 @@
 
 #include "hamlib/rig.h"
 
-extern const struct rig_caps ts990s_caps;
+extern struct rig_caps ts990s_caps;
 
 #endif
diff --git a/rigs/kenwood/tx500.c b/rigs/kenwood/tx500.c
index c1e494ee2..260016e34 100644
--- a/rigs/kenwood/tx500.c
+++ b/rigs/kenwood/tx500.c
@@ -121,7 +121,7 @@ static struct kenwood_priv_caps  tx500_priv_caps  =
  * TX-500 rig capabilities.
  *
  */
-const struct rig_caps tx500_caps =
+struct rig_caps tx500_caps =
 {
     RIG_MODEL(RIG_MODEL_LAB599_TX500),
     .model_name = "TX-500",
diff --git a/rigs/kenwood/xg3.c b/rigs/kenwood/xg3.c
index 3b0fb9b7d..4a149e2c7 100644
--- a/rigs/kenwood/xg3.c
+++ b/rigs/kenwood/xg3.c
@@ -100,7 +100,7 @@ int xg3_get_parm(RIG *rig, setting_t parm, value_t *val);
  * Part of info comes from http://www.elecraft.com/K2_Manual_Download_Page.htm#K2
  * look for KIO2 Programmer's Reference PDF
  */
-const struct rig_caps xg3_caps =
+struct rig_caps xg3_caps =
 {
     RIG_MODEL(RIG_MODEL_XG3),
     .model_name = "XG3",
diff --git a/rigs/kit/dds60.c b/rigs/kit/dds60.c
index a8a838d57..ccd6acb38 100644
--- a/rigs/kit/dds60.c
+++ b/rigs/kit/dds60.c
@@ -93,7 +93,7 @@ static int dds60_get_conf(RIG *rig, token_t token, char *val);
  * The receiver is controlled via the parallel port (D0,D1,D2).
  */
 
-const struct rig_caps dds60_caps =
+struct rig_caps dds60_caps =
 {
     RIG_MODEL(RIG_MODEL_DDS60),
     .model_name = "DDS-60",
diff --git a/rigs/kit/drt1.c b/rigs/kit/drt1.c
index b177bbc32..2780e9c5d 100644
--- a/rigs/kit/drt1.c
+++ b/rigs/kit/drt1.c
@@ -88,7 +88,7 @@ static int drt1_get_conf(RIG *rig, token_t token, char *val);
  * The receiver is controlled via the TX, RTS and DTR pins of the serial port.
  */
 
-const struct rig_caps drt1_caps =
+struct rig_caps drt1_caps =
 {
     RIG_MODEL(RIG_MODEL_DRT1),
     .model_name = "DRT1",
diff --git a/rigs/kit/dwt.c b/rigs/kit/dwt.c
index 9cc5d7c8d..f10e2b399 100644
--- a/rigs/kit/dwt.c
+++ b/rigs/kit/dwt.c
@@ -142,7 +142,7 @@ static const char *dwtdll_get_info(RIG *rig);
  * see Winradio G303 as an example
  */
 
-const struct rig_caps dwt_caps =
+struct rig_caps dwt_caps =
 {
     RIG_MODEL(RIG_MODEL_DWT),
     .model_name =       "Digital World Traveller",
@@ -542,7 +542,7 @@ static const char *dwt_get_info(RIG *rig);
  * see dsbr100.c as an example
  */
 
-const struct rig_caps dwt_caps =
+struct rig_caps dwt_caps =
 {
     RIG_MODEL(RIG_MODEL_DWT),
     .model_name =       "Digital World Traveller",
diff --git a/rigs/kit/elektor304.c b/rigs/kit/elektor304.c
index 64e21465a..d676b9d82 100644
--- a/rigs/kit/elektor304.c
+++ b/rigs/kit/elektor304.c
@@ -80,7 +80,7 @@ static int elektor304_get_conf(RIG *rig, token_t token, char *val);
  * The receiver is controlled via the TX, RTS and DTR pins of the serial port.
  */
 
-const struct rig_caps elektor304_caps =
+struct rig_caps elektor304_caps =
 {
     RIG_MODEL(RIG_MODEL_ELEKTOR304),
     .model_name = "Elektor 3/04",
diff --git a/rigs/kit/elektor507.c b/rigs/kit/elektor507.c
index 5afdd513e..a7b41aef5 100644
--- a/rigs/kit/elektor507.c
+++ b/rigs/kit/elektor507.c
@@ -553,7 +553,7 @@ int elektor507_ftdi_write_data(RIG *rig, void *FTOutBuf,
  * http://www.b-kainka.de/sdrusb.html
  */
 
-const struct rig_caps elektor507_caps =
+struct rig_caps elektor507_caps =
 {
     RIG_MODEL(RIG_MODEL_ELEKTOR507),
     .model_name =       "Elektor SDR-USB",
diff --git a/rigs/kit/fifisdr.c b/rigs/kit/fifisdr.c
index 1c86770e3..623e492f9 100644
--- a/rigs/kit/fifisdr.c
+++ b/rigs/kit/fifisdr.c
@@ -122,7 +122,7 @@ struct fifisdr_priv_instance_data
 
 
 /** FiFi-SDR receiver description. */
-const struct rig_caps fifisdr_caps =
+struct rig_caps fifisdr_caps =
 {
     RIG_MODEL(RIG_MODEL_FIFISDR),
     .model_name = "FiFi-SDR",
diff --git a/rigs/kit/funcube.c b/rigs/kit/funcube.c
index 67bcd9a0e..eeb5790db 100644
--- a/rigs/kit/funcube.c
+++ b/rigs/kit/funcube.c
@@ -94,7 +94,7 @@ struct funcube_priv_data
  *
  */
 
-const struct rig_caps funcube_caps =
+struct rig_caps funcube_caps =
 {
     RIG_MODEL(RIG_MODEL_FUNCUBEDONGLE),
     .model_name =       "FUNcube Dongle",
@@ -159,7 +159,7 @@ const struct rig_caps funcube_caps =
 };
 
 
-const struct rig_caps funcubeplus_caps =
+struct rig_caps funcubeplus_caps =
 {
     RIG_MODEL(RIG_MODEL_FUNCUBEDONGLEPLUS),
     .model_name =       "FUNcube Dongle Pro+",
diff --git a/rigs/kit/hiqsdr.c b/rigs/kit/hiqsdr.c
index 0ba1bfc89..929706380 100644
--- a/rigs/kit/hiqsdr.c
+++ b/rigs/kit/hiqsdr.c
@@ -98,7 +98,7 @@ const struct confparams hiqsdr_cfg_params[] =
 
 #define HIQSDR_MODES (RIG_MODE_CW|RIG_MODE_DSB)
 
-const struct rig_caps hiqsdr_caps =
+struct rig_caps hiqsdr_caps =
 {
     RIG_MODEL(RIG_MODEL_HIQSDR),
     .model_name =     "HiQSDR",
diff --git a/rigs/kit/kit.h b/rigs/kit/kit.h
index 9aecf8c4b..8c59207c3 100644
--- a/rigs/kit/kit.h
+++ b/rigs/kit/kit.h
@@ -25,24 +25,24 @@
 #include "hamlib/rig.h"
 #include "rotator.h"
 
-extern const struct rig_caps elektor304_caps;
-extern const struct rig_caps elektor507_caps;
-extern const struct rig_caps si570avrusb_caps;
-extern const struct rig_caps si570picusb_caps;
-extern const struct rig_caps si570peaberry1_caps;
-extern const struct rig_caps si570peaberry2_caps;
-extern const struct rig_caps drt1_caps;
-extern const struct rig_caps dwt_caps;
-extern const struct rig_caps usrp0_caps;
-extern const struct rig_caps usrp_caps;
-extern const struct rig_caps dds60_caps;
-extern const struct rig_caps miniVNA_caps;
-extern const struct rig_caps funcube_caps;
-extern const struct rig_caps funcubeplus_caps;
-extern const struct rig_caps fifisdr_caps;
-extern const struct rig_caps hiqsdr_caps;
-extern const struct rig_caps fasdr_caps;
-extern const struct rig_caps rshfiq_caps;
+extern struct rig_caps elektor304_caps;
+extern struct rig_caps elektor507_caps;
+extern struct rig_caps si570avrusb_caps;
+extern struct rig_caps si570picusb_caps;
+extern struct rig_caps si570peaberry1_caps;
+extern struct rig_caps si570peaberry2_caps;
+extern struct rig_caps drt1_caps;
+extern struct rig_caps dwt_caps;
+extern struct rig_caps usrp0_caps;
+extern struct rig_caps usrp_caps;
+extern struct rig_caps dds60_caps;
+extern struct rig_caps miniVNA_caps;
+extern struct rig_caps funcube_caps;
+extern struct rig_caps funcubeplus_caps;
+extern struct rig_caps fifisdr_caps;
+extern struct rig_caps hiqsdr_caps;
+extern struct rig_caps fasdr_caps;
+extern struct rig_caps rshfiq_caps;
 
 extern const struct rot_caps pcrotor_caps;
 
diff --git a/rigs/kit/miniVNA.c b/rigs/kit/miniVNA.c
index e2196218c..63ae146d5 100644
--- a/rigs/kit/miniVNA.c
+++ b/rigs/kit/miniVNA.c
@@ -54,7 +54,7 @@ static int miniVNA_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
     return RIG_OK;
 }
 
-const struct rig_caps miniVNA_caps =
+struct rig_caps miniVNA_caps =
 {
     RIG_MODEL(RIG_MODEL_MINIVNA),
     .model_name =     "miniVNA",
diff --git a/rigs/kit/rs_hfiq.c b/rigs/kit/rs_hfiq.c
index 8267971ac..bd726cd16 100644
--- a/rigs/kit/rs_hfiq.c
+++ b/rigs/kit/rs_hfiq.c
@@ -355,7 +355,7 @@ static int rshfiq_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
 }
 
 
-const struct rig_caps rshfiq_caps =
+struct rig_caps rshfiq_caps =
 {
     RIG_MODEL(RIG_MODEL_RSHFIQ),
     .model_name =     "RS-HFIQ",
diff --git a/rigs/kit/si570avrusb.c b/rigs/kit/si570avrusb.c
index 487656c1b..86b0b0163 100644
--- a/rigs/kit/si570avrusb.c
+++ b/rigs/kit/si570avrusb.c
@@ -151,7 +151,7 @@ struct si570xxxusb_priv_data
  *
  */
 
-const struct rig_caps si570avrusb_caps =
+struct rig_caps si570avrusb_caps =
 {
     RIG_MODEL(RIG_MODEL_SI570AVRUSB),
     .model_name =       "Si570 AVR-USB",
@@ -228,7 +228,7 @@ const struct rig_caps si570avrusb_caps =
  * Peaberry V1
  * http://www.ae9rb.com
  */
-const struct rig_caps si570peaberry1_caps =
+struct rig_caps si570peaberry1_caps =
 {
     RIG_MODEL(RIG_MODEL_SI570PEABERRY1),
     .model_name =       "Si570 Peaberry V1",
@@ -305,7 +305,7 @@ const struct rig_caps si570peaberry1_caps =
  * Peaberry V2
  * http://www.ae9rb.com
  */
-const struct rig_caps si570peaberry2_caps =
+struct rig_caps si570peaberry2_caps =
 {
     RIG_MODEL(RIG_MODEL_SI570PEABERRY2),
     .model_name =       "Si570 Peaberry V2",
@@ -387,7 +387,7 @@ const struct rig_caps si570peaberry2_caps =
  *
  *   http://home.kpn.nl/rw.engberts/sdr_kth.htm
  */
-const struct rig_caps si570picusb_caps =
+struct rig_caps si570picusb_caps =
 {
     RIG_MODEL(RIG_MODEL_SI570PICUSB),
     .model_name =       "Si570 PIC-USB",
@@ -468,7 +468,7 @@ const struct rig_caps si570picusb_caps =
  *   ( BX- 200 )
  */
 
-const struct rig_caps fasdr_caps =
+struct rig_caps fasdr_caps =
 {
     RIG_MODEL(RIG_MODEL_FASDR),
     .model_name =       "FA-SDR",
diff --git a/rigs/kit/usrp.c b/rigs/kit/usrp.c
index bf072d3b9..d389f2ca3 100644
--- a/rigs/kit/usrp.c
+++ b/rigs/kit/usrp.c
@@ -60,7 +60,7 @@ static const struct confparams usrp_cfg_params[] =
  *
  */
 
-const struct rig_caps usrp_caps =
+struct rig_caps usrp_caps =
 {
     RIG_MODEL(RIG_MODEL_USRP),
     .model_name = "USRP",
diff --git a/rigs/kit/usrp_impl.h b/rigs/kit/usrp_impl.h
index 461f1d1a3..a29ecb19a 100644
--- a/rigs/kit/usrp_impl.h
+++ b/rigs/kit/usrp_impl.h
@@ -41,8 +41,8 @@ int usrp_get_conf(RIG *rig, token_t token, char *val);
 
 const char * usrp_get_info(RIG *rig);
 
-extern const struct rig_caps usrp0_caps;
-extern const struct rig_caps usrp_caps;
+extern struct rig_caps usrp0_caps;
+extern struct rig_caps usrp_caps;
 
 __END_DECLS
 
diff --git a/rigs/lowe/hf235.c b/rigs/lowe/hf235.c
index 961f59577..ad7426db2 100644
--- a/rigs/lowe/hf235.c
+++ b/rigs/lowe/hf235.c
@@ -43,7 +43,7 @@
  *
  */
 
-const struct rig_caps hf235_caps =
+struct rig_caps hf235_caps =
 {
     RIG_MODEL(RIG_MODEL_HF235),
     .model_name = "HF-235",
diff --git a/rigs/lowe/lowe.h b/rigs/lowe/lowe.h
index e628f718b..e1e2f4973 100644
--- a/rigs/lowe/lowe.h
+++ b/rigs/lowe/lowe.h
@@ -34,6 +34,6 @@ int lowe_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
 int lowe_reset(RIG *rig, reset_t reset);
 const char *lowe_get_info(RIG *rig);
 
-extern const struct rig_caps hf235_caps;
+extern struct rig_caps hf235_caps;
 
 #endif /* _LOWE_H */
diff --git a/rigs/mds/4710.c b/rigs/mds/4710.c
index 879bf38a3..d1cfacac7 100644
--- a/rigs/mds/4710.c
+++ b/rigs/mds/4710.c
@@ -1,6 +1,6 @@
 #include "mds.h"
 
-const struct rig_caps mds_4710_caps =
+struct rig_caps mds_4710_caps =
 {
     RIG_MODEL(RIG_MODEL_MDS4710),
     .model_name =       "4710",
diff --git a/rigs/mds/9710.c b/rigs/mds/9710.c
index f380dbc79..b83a8c6d2 100644
--- a/rigs/mds/9710.c
+++ b/rigs/mds/9710.c
@@ -1,6 +1,6 @@
 #include "mds.h"
 
-const struct rig_caps mds_9710_caps =
+struct rig_caps mds_9710_caps =
 {
     RIG_MODEL(RIG_MODEL_MDS9710),
     .model_name =       "9710",
diff --git a/rigs/mds/mds.c b/rigs/mds/mds.c
index 0ff267c6c..9a2583e39 100644
--- a/rigs/mds/mds.c
+++ b/rigs/mds/mds.c
@@ -32,8 +32,8 @@
 
 #define MAXCMDLEN 32
 
-extern const struct rig_caps mds_4710_caps;
-extern const struct rig_caps mds_9710_caps;
+extern struct rig_caps mds_4710_caps;
+extern struct rig_caps mds_9710_caps;
 
 DECLARE_INITRIG_BACKEND(mds)
 {
diff --git a/rigs/mds/mds.h b/rigs/mds/mds.h
index 2b985eb80..2274b97f8 100644
--- a/rigs/mds/mds.h
+++ b/rigs/mds/mds.h
@@ -15,8 +15,8 @@ struct mds_priv_data {
     char ret_data[MDS_RET_LEN];       /* returned data--max value, most are less */
 };
 
-extern const struct rig_caps mds_4710_caps;
-extern const struct rig_caps mds_9710_caps;
+extern struct rig_caps mds_4710_caps;
+extern struct rig_caps mds_9710_caps;
 
 int mds_init(RIG *rig);
 int mds_open(RIG *rig);
diff --git a/rigs/pcr/pcr.h b/rigs/pcr/pcr.h
index 89714f1f1..9c35466e0 100644
--- a/rigs/pcr/pcr.h
+++ b/rigs/pcr/pcr.h
@@ -121,9 +121,9 @@ int pcr_get_dcd(RIG * rig, vfo_t vfo, dcd_t *dcd);
 // int pcr_get_param(RIG *rig, setting_t parm, value_t *val);
 // int pcr_set_param(RIG *rig, setting_t parm, value_t *val);
 
-extern const struct rig_caps pcr1000_caps;
-extern const struct rig_caps pcr100_caps;
-extern const struct rig_caps pcr1500_caps;
-extern const struct rig_caps pcr2500_caps;
+extern struct rig_caps pcr1000_caps;
+extern struct rig_caps pcr100_caps;
+extern struct rig_caps pcr1500_caps;
+extern struct rig_caps pcr2500_caps;
 
 #endif /* _PCR_H */
diff --git a/rigs/pcr/pcr100.c b/rigs/pcr/pcr100.c
index 2bcd2c245..bb6a568e0 100644
--- a/rigs/pcr/pcr100.c
+++ b/rigs/pcr/pcr100.c
@@ -53,7 +53,7 @@ static const struct pcr_priv_caps pcr100_priv =
 /*
  * IC PCR100 rigs capabilities.
  */
-const struct rig_caps pcr100_caps =
+struct rig_caps pcr100_caps =
 {
     RIG_MODEL(RIG_MODEL_PCR100),
     .model_name     = "IC-PCR100",
diff --git a/rigs/pcr/pcr1000.c b/rigs/pcr/pcr1000.c
index db680eec1..398568204 100644
--- a/rigs/pcr/pcr1000.c
+++ b/rigs/pcr/pcr1000.c
@@ -46,7 +46,7 @@ static const struct pcr_priv_caps pcr1000_priv =
 /*
  * IC PCR1000 rigs capabilities.
  */
-const struct rig_caps pcr1000_caps =
+struct rig_caps pcr1000_caps =
 {
     RIG_MODEL(RIG_MODEL_PCR1000),
     .model_name     = "IC-PCR1000",
diff --git a/rigs/pcr/pcr1500.c b/rigs/pcr/pcr1500.c
index 4cb08a94f..1012353f7 100644
--- a/rigs/pcr/pcr1500.c
+++ b/rigs/pcr/pcr1500.c
@@ -49,7 +49,7 @@ static const struct pcr_priv_caps pcr1500_priv =
 /*
  * IC PCR1500 rigs capabilities.
  */
-const struct rig_caps pcr1500_caps =
+struct rig_caps pcr1500_caps =
 {
     RIG_MODEL(RIG_MODEL_PCR1500),
     .model_name     = "IC-PCR1500",
diff --git a/rigs/pcr/pcr2500.c b/rigs/pcr/pcr2500.c
index 520ab89db..c946991da 100644
--- a/rigs/pcr/pcr2500.c
+++ b/rigs/pcr/pcr2500.c
@@ -58,7 +58,7 @@ static const struct pcr_priv_caps pcr2500_priv =
 /*
  * IC PCR2500 rigs capabilities.
  */
-const struct rig_caps pcr2500_caps =
+struct rig_caps pcr2500_caps =
 {
     RIG_MODEL(RIG_MODEL_PCR2500),
     .model_name     = "IC-PCR2500",
diff --git a/rigs/prm80/prm80.h b/rigs/prm80/prm80.h
index 0984ea799..43efda3b5 100644
--- a/rigs/prm80/prm80.h
+++ b/rigs/prm80/prm80.h
@@ -65,6 +65,6 @@ int prm80_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt);
 
 const char *prm80_get_info(RIG *rig);
 
-extern const struct rig_caps prm8060_caps;
+extern struct rig_caps prm8060_caps;
 
 #endif /* _PRM80_H */
diff --git a/rigs/prm80/prm8060.c b/rigs/prm80/prm8060.c
index c249c5dc3..2df73290f 100644
--- a/rigs/prm80/prm8060.c
+++ b/rigs/prm80/prm8060.c
@@ -61,7 +61,7 @@
  * http://prm80.sourceforge.net/
  * https://github.com/f4fez/prm80
  */
-const struct rig_caps prm8060_caps =
+struct rig_caps prm8060_caps =
 {
     RIG_MODEL(RIG_MODEL_PRM8060),
     .model_name = "PRM8060",
diff --git a/rigs/racal/ra3702.c b/rigs/racal/ra3702.c
index 3fbdb78e4..5ed8aa3b2 100644
--- a/rigs/racal/ra3702.c
+++ b/rigs/racal/ra3702.c
@@ -44,7 +44,7 @@
  * Required A6A1 serial asynchronous interface
  *
  */
-const struct rig_caps ra3702_caps =
+struct rig_caps ra3702_caps =
 {
     RIG_MODEL(RIG_MODEL_RA3702),
     .model_name = "RA3702",
diff --git a/rigs/racal/ra6790.c b/rigs/racal/ra6790.c
index f82769b21..74817ece5 100644
--- a/rigs/racal/ra6790.c
+++ b/rigs/racal/ra6790.c
@@ -41,7 +41,7 @@
  * Required A6A1 serial asynchronous interface
  *
  */
-const struct rig_caps ra6790_caps =
+struct rig_caps ra6790_caps =
 {
     RIG_MODEL(RIG_MODEL_RA6790),
     .model_name = "RA6790/GM",
diff --git a/rigs/racal/racal.h b/rigs/racal/racal.h
index 863dda9c4..d8ea7c102 100644
--- a/rigs/racal/racal.h
+++ b/rigs/racal/racal.h
@@ -53,8 +53,8 @@ int racal_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
 int racal_reset(RIG *rig, reset_t reset);
 const char* racal_get_info(RIG *rig);
 
-extern const struct rig_caps ra6790_caps;
-extern const struct rig_caps ra3702_caps;
+extern struct rig_caps ra6790_caps;
+extern struct rig_caps ra3702_caps;
 
 
 #endif	/* _RACAL_H */
diff --git a/rigs/rft/ekd500.c b/rigs/rft/ekd500.c
index cb0d7db66..70fb13525 100644
--- a/rigs/rft/ekd500.c
+++ b/rigs/rft/ekd500.c
@@ -45,7 +45,7 @@
  *   http://www.premium-rx.org/ekd500.htm
  */
 
-const struct rig_caps ekd500_caps =
+struct rig_caps ekd500_caps =
 {
     RIG_MODEL(RIG_MODEL_EKD500),
     .model_name = "EKD-500",
diff --git a/rigs/rft/rft.h b/rigs/rft/rft.h
index 0b934710d..01b8834b3 100644
--- a/rigs/rft/rft.h
+++ b/rigs/rft/rft.h
@@ -28,6 +28,6 @@
 
 int rft_set_freq(RIG *rig, vfo_t vfo, freq_t freq);
 
-extern const struct rig_caps ekd500_caps;
+extern struct rig_caps ekd500_caps;
 
 #endif /* _RFT_H */
diff --git a/rigs/rs/eb200.c b/rigs/rs/eb200.c
index f1a2431a8..7ae7f0ad8 100644
--- a/rigs/rs/eb200.c
+++ b/rigs/rs/eb200.c
@@ -64,7 +64,7 @@
  *  - set_ant
  */
 
-const struct rig_caps eb200_caps =
+struct rig_caps eb200_caps =
 {
     RIG_MODEL(RIG_MODEL_EB200),
     .model_name = "EB200",
diff --git a/rigs/rs/ek89x.c b/rigs/rs/ek89x.c
index 47409a47b..8b84df973 100644
--- a/rigs/rs/ek89x.c
+++ b/rigs/rs/ek89x.c
@@ -513,7 +513,7 @@ ek89x_get_info(RIG *rig)
  *  - set/get_channels
  */
 
-const struct rig_caps ek89x_caps =
+struct rig_caps ek89x_caps =
 {
     RIG_MODEL(RIG_MODEL_EK89X),
     .model_name = "EK895/6",
diff --git a/rigs/rs/ek89x.h b/rigs/rs/ek89x.h
index 58c86d3fe..24591be65 100644
--- a/rigs/rs/ek89x.h
+++ b/rigs/rs/ek89x.h
@@ -41,6 +41,6 @@ int ek89x_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
 int ek89x_reset(RIG *rig, reset_t reset);
 const char * gek89x_get_info(RIG *rig);
 
-extern const struct rig_caps ek89x_caps;
+extern struct rig_caps ek89x_caps;
 
 #endif /* EK89X_H */
diff --git a/rigs/rs/esmc.c b/rigs/rs/esmc.c
index d627b3d90..94dfea7f1 100644
--- a/rigs/rs/esmc.c
+++ b/rigs/rs/esmc.c
@@ -58,7 +58,7 @@
  * http://www2.rohde-schwarz.com/file/ESMC_25.pdf
  */
 
-const struct rig_caps esmc_caps =
+struct rig_caps esmc_caps =
 {
     RIG_MODEL(RIG_MODEL_ESMC),
     .model_name = "ESMC",
diff --git a/rigs/rs/gp2000.h b/rigs/rs/gp2000.h
index 848f1ca00..0e7e20ee9 100644
--- a/rigs/rs/gp2000.h
+++ b/rigs/rs/gp2000.h
@@ -43,6 +43,6 @@ int gp2000_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
 int gp2000_reset(RIG *rig, reset_t reset);
 const char * gp2000_get_info(RIG *rig);
 
-extern const struct rig_caps xk2100_caps;
+extern struct rig_caps xk2100_caps;
 
 #endif /* XK2000_H */
diff --git a/rigs/rs/rs.h b/rigs/rs/rs.h
index f7baa4477..729f1ddf5 100644
--- a/rigs/rs/rs.h
+++ b/rigs/rs/rs.h
@@ -37,7 +37,7 @@ int rs_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
 int rs_reset(RIG *rig, reset_t reset);
 const char * rs_get_info(RIG *rig);
 
-extern const struct rig_caps esmc_caps;
-extern const struct rig_caps eb200_caps;
+extern struct rig_caps esmc_caps;
+extern struct rig_caps eb200_caps;
 
 #endif /* _RS_H */
diff --git a/rigs/rs/xk2100.c b/rigs/rs/xk2100.c
index 2355be89f..c97dd04a4 100644
--- a/rigs/rs/xk2100.c
+++ b/rigs/rs/xk2100.c
@@ -66,7 +66,7 @@
  *  - set/get_channels
  */
 
-const struct rig_caps xk2100_caps =
+struct rig_caps xk2100_caps =
 {
     RIG_MODEL(RIG_MODEL_XK2100),
     .model_name = "XK2100",
diff --git a/rigs/skanti/skanti.h b/rigs/skanti/skanti.h
index acf0ac4c2..4993900ef 100644
--- a/rigs/skanti/skanti.h
+++ b/rigs/skanti/skanti.h
@@ -34,7 +34,7 @@ int skanti_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val);
 int skanti_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt);
 int skanti_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op);
 
-extern const struct rig_caps trp8000_caps;
-extern const struct rig_caps trp8255_caps;
+extern struct rig_caps trp8000_caps;
+extern struct rig_caps trp8255_caps;
 
 #endif /* _SKANTI_H */
diff --git a/rigs/skanti/trp8000.c b/rigs/skanti/trp8000.c
index 1c8bc6afa..1e45a1069 100644
--- a/rigs/skanti/trp8000.c
+++ b/rigs/skanti/trp8000.c
@@ -44,7 +44,7 @@
  *
  * TODO: TUNING, BFO, SENSITIVITY(RF gain?)
  */
-const struct rig_caps trp8000_caps =
+struct rig_caps trp8000_caps =
 {
     RIG_MODEL(RIG_MODEL_TRP8000),
     .model_name = "TRP8000",
diff --git a/rigs/skanti/trp8255.c b/rigs/skanti/trp8255.c
index 40ccb8d0b..c5b67f1c8 100644
--- a/rigs/skanti/trp8255.c
+++ b/rigs/skanti/trp8255.c
@@ -79,7 +79,7 @@ static int cu_vfo_op(RIG *rig, vfo_t vfo, vfo_op_t op);
  * because the TRP8255 has the "CU" (Control Unit).
  *
  */
-const struct rig_caps trp8255_caps =
+struct rig_caps trp8255_caps =
 {
     RIG_MODEL(RIG_MODEL_TRP8255),
     .model_name = "TRP 8255 S R",
diff --git a/rigs/tapr/dsp10.c b/rigs/tapr/dsp10.c
index 9b8ade444..73094eab2 100644
--- a/rigs/tapr/dsp10.c
+++ b/rigs/tapr/dsp10.c
@@ -52,7 +52,7 @@
  *
  *
  */
-const struct rig_caps dsp10_caps =
+struct rig_caps dsp10_caps =
 {
     RIG_MODEL(RIG_MODEL_DSP10),
     .model_name = "DSP-10",
diff --git a/rigs/tapr/tapr.h b/rigs/tapr/tapr.h
index 10ccdecfe..7921766d2 100644
--- a/rigs/tapr/tapr.h
+++ b/rigs/tapr/tapr.h
@@ -28,6 +28,6 @@
 int tapr_set_freq(RIG *rig, vfo_t vfo, freq_t freq);
 int tapr_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width);
 
-extern const struct rig_caps dsp10_caps;
+extern struct rig_caps dsp10_caps;
 
 #endif /* _TAPR_H */
diff --git a/rigs/tentec/argonaut.c b/rigs/tentec/argonaut.c
index 19f43fc6e..2a9c0ee8b 100644
--- a/rigs/tentec/argonaut.c
+++ b/rigs/tentec/argonaut.c
@@ -71,7 +71,7 @@
  *      http://www.rfsquared.com/
  *
  */
-const struct rig_caps tt516_caps =
+struct rig_caps tt516_caps =
 {
     RIG_MODEL(RIG_MODEL_TT516),
     .model_name = "TT-516 Argonaut V",
diff --git a/rigs/tentec/jupiter.c b/rigs/tentec/jupiter.c
index 230bb3243..cc056855a 100644
--- a/rigs/tentec/jupiter.c
+++ b/rigs/tentec/jupiter.c
@@ -123,7 +123,7 @@ static int tt538_set_func(RIG *rig, vfo_t vfo, setting_t func, int status);
  * Protocol is documented at
  *      http://www.rfsquared.com/
  */
-const struct rig_caps tt538_caps =
+struct rig_caps tt538_caps =
 {
     RIG_MODEL(RIG_MODEL_TT538),
     .model_name = "TT-538 Jupiter",
diff --git a/rigs/tentec/omnivii.c b/rigs/tentec/omnivii.c
index ddf00ad56..c82830846 100644
--- a/rigs/tentec/omnivii.c
+++ b/rigs/tentec/omnivii.c
@@ -119,7 +119,7 @@ static int tt588_set_ant(RIG *rig, vfo_t vfo, ant_t ant);
  *
  * Protocol is documented at the tentec site
  */
-const struct rig_caps tt588_caps =
+struct rig_caps tt588_caps =
 {
     RIG_MODEL(RIG_MODEL_TT588),
     .model_name = "TT-588 Omni VII",
diff --git a/rigs/tentec/orion.h b/rigs/tentec/orion.h
index 778a47f3d..f138c8d3d 100644
--- a/rigs/tentec/orion.h
+++ b/rigs/tentec/orion.h
@@ -196,7 +196,7 @@ struct tt565_priv_data {
  * Protocol is documented at Tentec's firmware site
  *		http://www.rfsquared.com/
  */
-const struct rig_caps tt565_caps = {
+struct rig_caps tt565_caps = {
 RIG_MODEL(RIG_MODEL_TT565),
 .model_name = "TT-565 Orion",
 .mfg_name =  "Ten-Tec",
@@ -414,7 +414,7 @@ RIG_MODEL(RIG_MODEL_TT565),
  *		http://www.tentec.com/index.php?id=360#down
  *
  */
-const struct rig_caps tt599_caps = {
+struct rig_caps tt599_caps = {
 RIG_MODEL(RIG_MODEL_TT599),
 .model_name = "TT-599 Eagle",
 .mfg_name =  "Ten-Tec",
diff --git a/rigs/tentec/paragon.c b/rigs/tentec/paragon.c
index cb639b8db..10a8949cc 100644
--- a/rigs/tentec/paragon.c
+++ b/rigs/tentec/paragon.c
@@ -92,7 +92,7 @@ static int tt585_get_status_data(RIG *rig);
  * tt585 transceiver capabilities,
  * with the optional model 258 RS232 Interface board.
  */
-const struct rig_caps tt585_caps =
+struct rig_caps tt585_caps =
 {
     RIG_MODEL(RIG_MODEL_TT585),
     .model_name = "TT-585 Paragon",
diff --git a/rigs/tentec/pegasus.c b/rigs/tentec/pegasus.c
index d3f8753c2..fb664a7c0 100644
--- a/rigs/tentec/pegasus.c
+++ b/rigs/tentec/pegasus.c
@@ -60,7 +60,7 @@
  *
  * TODO:
  */
-const struct rig_caps tt550_caps =
+struct rig_caps tt550_caps =
 {
     RIG_MODEL(RIG_MODEL_TT550),
     .model_name = "TT-550",
diff --git a/rigs/tentec/rx320.c b/rigs/tentec/rx320.c
index 060e86190..b84deac38 100644
--- a/rigs/tentec/rx320.c
+++ b/rigs/tentec/rx320.c
@@ -66,7 +66,7 @@
  *
  * TODO:
  */
-const struct rig_caps rx320_caps =
+struct rig_caps rx320_caps =
 {
     RIG_MODEL(RIG_MODEL_RX320),
     .model_name = "RX-320",
diff --git a/rigs/tentec/rx331.c b/rigs/tentec/rx331.c
index 8b9e038e6..9afa54a75 100644
--- a/rigs/tentec/rx331.c
+++ b/rigs/tentec/rx331.c
@@ -88,7 +88,7 @@ static const char *rx331_get_info(RIG *rig);
  *
  * TODO: from/to memory
  */
-const struct rig_caps rx331_caps =
+struct rig_caps rx331_caps =
 {
     RIG_MODEL(RIG_MODEL_RX331),
     .model_name = "RX-331",
diff --git a/rigs/tentec/rx340.c b/rigs/tentec/rx340.c
index 6ee0bec70..604253e84 100644
--- a/rigs/tentec/rx340.c
+++ b/rigs/tentec/rx340.c
@@ -77,7 +77,7 @@ static const char *rx340_get_info(RIG *rig);
  * TODO: from/to memory, scan, get_level, ..
  * supposes non-multidrop
  */
-const struct rig_caps rx340_caps =
+struct rig_caps rx340_caps =
 {
     RIG_MODEL(RIG_MODEL_RX340),
     .model_name = "RX-340",
diff --git a/rigs/tentec/rx350.c b/rigs/tentec/rx350.c
index c3904a650..3322bec76 100644
--- a/rigs/tentec/rx350.c
+++ b/rigs/tentec/rx350.c
@@ -75,7 +75,7 @@
  * Only set_freq is supposed to work.
  * This is a skeleton.
  */
-const struct rig_caps rx350_caps =
+struct rig_caps rx350_caps =
 {
     RIG_MODEL(RIG_MODEL_RX350),
     .model_name = "RX-350",
diff --git a/rigs/tentec/tentec.h b/rigs/tentec/tentec.h
index 2989d1b3f..9e48697f5 100644
--- a/rigs/tentec/tentec.h
+++ b/rigs/tentec/tentec.h
@@ -70,17 +70,17 @@ int tentec_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val);
 int tentec_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
 const char* tentec_get_info(RIG *rig);
 
-extern const struct rig_caps rx320_caps;
-extern const struct rig_caps rx340_caps;
-extern const struct rig_caps rx350_caps;
-extern const struct rig_caps tt516_caps;
-extern const struct rig_caps tt538_caps;
-extern const struct rig_caps tt585_caps;
-extern const struct rig_caps tt588_caps;
-extern const struct rig_caps tt550_caps;
-extern const struct rig_caps tt565_caps;
-extern const struct rig_caps tt599_caps;
-extern const struct rig_caps rx331_caps;
+extern struct rig_caps rx320_caps;
+extern struct rig_caps rx340_caps;
+extern struct rig_caps rx350_caps;
+extern struct rig_caps tt516_caps;
+extern struct rig_caps tt538_caps;
+extern struct rig_caps tt585_caps;
+extern struct rig_caps tt588_caps;
+extern struct rig_caps tt550_caps;
+extern struct rig_caps tt565_caps;
+extern struct rig_caps tt599_caps;
+extern struct rig_caps rx331_caps;
 
 
 #endif /* _TENTEC_H */
diff --git a/rigs/tuner/tuner.h b/rigs/tuner/tuner.h
index 883bd4c77..fd02dd92a 100644
--- a/rigs/tuner/tuner.h
+++ b/rigs/tuner/tuner.h
@@ -33,7 +33,7 @@
 
 #include "hamlib/rig.h"
 
-extern const struct rig_caps v4l_caps;
-extern const struct rig_caps v4l2_caps;
+extern struct rig_caps v4l_caps;
+extern struct rig_caps v4l2_caps;
 
 #endif /* _TUNER_H */
diff --git a/rigs/tuner/v4l.c b/rigs/tuner/v4l.c
index 888c3517c..4f2345626 100644
--- a/rigs/tuner/v4l.c
+++ b/rigs/tuner/v4l.c
@@ -63,7 +63,7 @@ static const char *v4l_get_info(RIG *rig);
  *
  *
  */
-const struct rig_caps v4l_caps =
+struct rig_caps v4l_caps =
 {
     RIG_MODEL(RIG_MODEL_V4L),
     .model_name = "SW/FM radio",
diff --git a/rigs/tuner/v4l2.c b/rigs/tuner/v4l2.c
index 868f1821d..5bd53d6ec 100644
--- a/rigs/tuner/v4l2.c
+++ b/rigs/tuner/v4l2.c
@@ -63,7 +63,7 @@ static const char *v4l2_get_info(RIG *rig);
  *
  *
  */
-const struct rig_caps v4l2_caps =
+struct rig_caps v4l2_caps =
 {
     RIG_MODEL(RIG_MODEL_V4L2),
     .model_name = "SW/FM radio",
diff --git a/rigs/uniden/bc245.c b/rigs/uniden/bc245.c
index ab6e49c44..40a96dd46 100644
--- a/rigs/uniden/bc245.c
+++ b/rigs/uniden/bc245.c
@@ -41,7 +41,7 @@
  *
  * TODO: check this with manual or web site.
  */
-const struct rig_caps bc245_caps =
+struct rig_caps bc245_caps =
 {
     RIG_MODEL(RIG_MODEL_BC245),
     .model_name = "BC245xlt",
diff --git a/rigs/uniden/bc250.c b/rigs/uniden/bc250.c
index b6002cb9e..bcfc89754 100644
--- a/rigs/uniden/bc250.c
+++ b/rigs/uniden/bc250.c
@@ -50,7 +50,7 @@
  *
  * TODO: check this with manual or web site.
  */
-const struct rig_caps bc250_caps =
+struct rig_caps bc250_caps =
 {
     RIG_MODEL(RIG_MODEL_BC250),
     .model_name = "BC250D",
diff --git a/rigs/uniden/bc780.c b/rigs/uniden/bc780.c
index f4d75c3f4..4a826b1db 100644
--- a/rigs/uniden/bc780.c
+++ b/rigs/uniden/bc780.c
@@ -50,7 +50,7 @@
  *
  * TODO: check this with manual or web site.
  */
-const struct rig_caps bc780_caps =
+struct rig_caps bc780_caps =
 {
     RIG_MODEL(RIG_MODEL_BC780),
     .model_name = "BC780xlt",
diff --git a/rigs/uniden/bc895.c b/rigs/uniden/bc895.c
index bb19ad8e4..46709c980 100644
--- a/rigs/uniden/bc895.c
+++ b/rigs/uniden/bc895.c
@@ -56,7 +56,7 @@
  *
  * TODO: check this with manual or web site.
  */
-const struct rig_caps bc895_caps =
+struct rig_caps bc895_caps =
 {
     RIG_MODEL(RIG_MODEL_BC895),
     .model_name = "BC895xlt",
diff --git a/rigs/uniden/bc898.c b/rigs/uniden/bc898.c
index b199ddd31..bbbc30985 100644
--- a/rigs/uniden/bc898.c
+++ b/rigs/uniden/bc898.c
@@ -67,7 +67,7 @@ static tone_t bc898_ctcss_list[] =
  * TODO: check this with manual or web site.
  * http://www.uniden.com/products/productdetail.cfm?product=BC898T&filter=Mobile
  */
-const struct rig_caps bc898_caps =
+struct rig_caps bc898_caps =
 {
     RIG_MODEL(RIG_MODEL_BC898),
     .model_name = "BC898T",
diff --git a/rigs/uniden/bcd396t.c b/rigs/uniden/bcd396t.c
index b36b80e65..01c17553f 100644
--- a/rigs/uniden/bcd396t.c
+++ b/rigs/uniden/bcd396t.c
@@ -48,7 +48,7 @@
  *
  * TODO: check this with manual or web site.
  */
-const struct rig_caps bcd396t_caps =
+struct rig_caps bcd396t_caps =
 {
     RIG_MODEL(RIG_MODEL_BCD396T),
     .model_name = "BCD-396T",
diff --git a/rigs/uniden/bcd996t.c b/rigs/uniden/bcd996t.c
index 9a494dce4..385b81055 100644
--- a/rigs/uniden/bcd996t.c
+++ b/rigs/uniden/bcd996t.c
@@ -48,7 +48,7 @@
  *
  * TODO: check this with manual or web site.
  */
-const struct rig_caps bcd996t_caps =
+struct rig_caps bcd996t_caps =
 {
     RIG_MODEL(RIG_MODEL_BCD996T),
     .model_name = "BCD-996T",
diff --git a/rigs/uniden/pro2052.c b/rigs/uniden/pro2052.c
index 42971f109..b35b30703 100644
--- a/rigs/uniden/pro2052.c
+++ b/rigs/uniden/pro2052.c
@@ -53,7 +53,7 @@
  *
  * TODO: check this with manual or web site.
  */
-const struct rig_caps pro2052_caps =
+struct rig_caps pro2052_caps =
 {
     RIG_MODEL(RIG_MODEL_PRO2052),
     .model_name = "PRO-2052",
diff --git a/rigs/uniden/uniden.h b/rigs/uniden/uniden.h
index e5cc7d63d..085e25c25 100644
--- a/rigs/uniden/uniden.h
+++ b/rigs/uniden/uniden.h
@@ -71,14 +71,14 @@ int uniden_get_channel(RIG *rig, vfo_t vfo, channel_t *chan, int read_only);
 int uniden_set_channel(RIG *rig, vfo_t vfo, const channel_t *chan);
 const char* uniden_get_info(RIG *rig);
 
-extern const struct rig_caps bc895_caps;
-extern const struct rig_caps bc898_caps;
-extern const struct rig_caps bc245_caps;
-extern const struct rig_caps bc780_caps;
-extern const struct rig_caps bc250_caps;
-extern const struct rig_caps pro2052_caps;
+extern struct rig_caps bc895_caps;
+extern struct rig_caps bc898_caps;
+extern struct rig_caps bc245_caps;
+extern struct rig_caps bc780_caps;
+extern struct rig_caps bc250_caps;
+extern struct rig_caps pro2052_caps;
 
-extern const struct rig_caps bcd396t_caps;
-extern const struct rig_caps bcd996t_caps;
+extern struct rig_caps bcd396t_caps;
+extern struct rig_caps bcd996t_caps;
 
 #endif /* _UNIDEN_H */
diff --git a/rigs/winradio/g303.c b/rigs/winradio/g303.c
index 96f1ef8c7..6fcd1a793 100644
--- a/rigs/winradio/g303.c
+++ b/rigs/winradio/g303.c
@@ -120,7 +120,7 @@ struct g3_priv_data
 };
 
 
-const struct rig_caps g303_caps =
+struct rig_caps g303_caps =
 {
     RIG_MODEL(RIG_MODEL_G303),
     .model_name =     "WR-G303",
diff --git a/rigs/winradio/g305.c b/rigs/winradio/g305.c
index 92abc1dfb..d962d41fe 100644
--- a/rigs/winradio/g305.c
+++ b/rigs/winradio/g305.c
@@ -121,7 +121,7 @@ struct g3_priv_data
 };
 
 
-const struct rig_caps g305_caps =
+struct rig_caps g305_caps =
 {
     RIG_MODEL(RIG_MODEL_G305),
     .model_name =     "WR-G305",
diff --git a/rigs/winradio/g313-posix.c b/rigs/winradio/g313-posix.c
index 6903011b7..a79787f7a 100644
--- a/rigs/winradio/g313-posix.c
+++ b/rigs/winradio/g313-posix.c
@@ -643,7 +643,7 @@ static void  g313_spectrum_callback(float *buffer, int count, void *arg)
 #pragma GCC diagnostic pop
 }
 
-const struct rig_caps g313_caps =
+struct rig_caps g313_caps =
 {
     RIG_MODEL(RIG_MODEL_G313),
     .model_name =     "WR-G313",
diff --git a/rigs/winradio/g313-win.c b/rigs/winradio/g313-win.c
index 1c32faf72..f4916d318 100644
--- a/rigs/winradio/g313-win.c
+++ b/rigs/winradio/g313-win.c
@@ -157,7 +157,7 @@ struct g313_priv_data
 };
 
 
-const struct rig_caps g313_caps =
+struct rig_caps g313_caps =
 {
     RIG_MODEL(RIG_MODEL_G313),
     .model_name =     "WR-G313",
diff --git a/rigs/winradio/winradio.h b/rigs/winradio/winradio.h
index 1f6766b6d..57e609e2b 100644
--- a/rigs/winradio/winradio.h
+++ b/rigs/winradio/winradio.h
@@ -48,17 +48,17 @@ int wr_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val);
 int wr_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
 const char *wr_get_info(RIG *rig);
 
-extern const struct rig_caps wr1000_caps;
-extern const struct rig_caps wr1500_caps;
-extern const struct rig_caps wr1550_caps;
-extern const struct rig_caps wr3100_caps;
-extern const struct rig_caps wr3150_caps;
-extern const struct rig_caps wr3500_caps;
-extern const struct rig_caps wr3700_caps;
-extern const struct rig_caps g303_caps;
-extern const struct rig_caps g305_caps;
+extern struct rig_caps wr1000_caps;
+extern struct rig_caps wr1500_caps;
+extern struct rig_caps wr1550_caps;
+extern struct rig_caps wr3100_caps;
+extern struct rig_caps wr3150_caps;
+extern struct rig_caps wr3500_caps;
+extern struct rig_caps wr3700_caps;
+extern struct rig_caps g303_caps;
+extern struct rig_caps g305_caps;
 #if defined( _WIN32) || !defined(OTHER_POSIX)
-extern const struct rig_caps g313_caps;
+extern struct rig_caps g313_caps;
 #endif
 
 #endif /* _WINRADIO_H */
diff --git a/rigs/winradio/wr1000.c b/rigs/winradio/wr1000.c
index 8b1852b77..293d323c8 100644
--- a/rigs/winradio/wr1000.c
+++ b/rigs/winradio/wr1000.c
@@ -38,7 +38,7 @@
 #define WR1000_MODES (RIG_MODE_AM | \
                      RIG_MODE_USB | RIG_MODE_LSB | RIG_MODE_FM)
 
-const struct rig_caps wr1000_caps =
+struct rig_caps wr1000_caps =
 {
     RIG_MODEL(RIG_MODEL_WR1000),
     .model_name =     "WR-1000",
diff --git a/rigs/winradio/wr1500.c b/rigs/winradio/wr1500.c
index a4d1c1ee4..4502d4c96 100644
--- a/rigs/winradio/wr1500.c
+++ b/rigs/winradio/wr1500.c
@@ -37,7 +37,7 @@
 #define WR1500_MODES (RIG_MODE_AM | RIG_MODE_CW | \
                      RIG_MODE_USB | RIG_MODE_LSB | RIG_MODE_FM)
 
-const struct rig_caps wr1500_caps =
+struct rig_caps wr1500_caps =
 {
     RIG_MODEL(RIG_MODEL_WR1500),
     .model_name =     "WR-1500",
diff --git a/rigs/winradio/wr1550.c b/rigs/winradio/wr1550.c
index 45dee1bea..023b2f8d3 100644
--- a/rigs/winradio/wr1550.c
+++ b/rigs/winradio/wr1550.c
@@ -37,7 +37,7 @@
 #define WR1550_MODES (RIG_MODE_AM | RIG_MODE_CW | \
                      RIG_MODE_USB | RIG_MODE_LSB | RIG_MODE_FM)
 
-const struct rig_caps wr1550_caps =
+struct rig_caps wr1550_caps =
 {
     RIG_MODEL(RIG_MODEL_WR1550),
     .model_name =     "WR-1550",
diff --git a/rigs/winradio/wr3100.c b/rigs/winradio/wr3100.c
index ee83831a8..842cd1662 100644
--- a/rigs/winradio/wr3100.c
+++ b/rigs/winradio/wr3100.c
@@ -37,7 +37,7 @@
 #define WR3100_MODES (RIG_MODE_AM | RIG_MODE_CW | \
                      RIG_MODE_USB | RIG_MODE_LSB | RIG_MODE_FM)
 
-const struct rig_caps wr3100_caps =
+struct rig_caps wr3100_caps =
 {
     RIG_MODEL(RIG_MODEL_WR3100),
     .model_name =     "WR-3100",
diff --git a/rigs/winradio/wr3150.c b/rigs/winradio/wr3150.c
index 10decc413..c7c2e6b3f 100644
--- a/rigs/winradio/wr3150.c
+++ b/rigs/winradio/wr3150.c
@@ -37,7 +37,7 @@
 #define WR3150_MODES (RIG_MODE_AM | RIG_MODE_CW | \
                      RIG_MODE_USB | RIG_MODE_LSB | RIG_MODE_FM)
 
-const struct rig_caps wr3150_caps =
+struct rig_caps wr3150_caps =
 {
     RIG_MODEL(RIG_MODEL_WR3150),
     .model_name =     "WR-3150",
diff --git a/rigs/winradio/wr3500.c b/rigs/winradio/wr3500.c
index d5310c89d..a52d4c355 100644
--- a/rigs/winradio/wr3500.c
+++ b/rigs/winradio/wr3500.c
@@ -37,7 +37,7 @@
 #define WR3500_MODES (RIG_MODE_AM | RIG_MODE_CW | \
                      RIG_MODE_USB | RIG_MODE_LSB | RIG_MODE_FM)
 
-const struct rig_caps wr3500_caps =
+struct rig_caps wr3500_caps =
 {
     RIG_MODEL(RIG_MODEL_WR3500),
     .model_name =     "WR-3500",
diff --git a/rigs/winradio/wr3700.c b/rigs/winradio/wr3700.c
index 4d1e8440c..5b932b6d2 100644
--- a/rigs/winradio/wr3700.c
+++ b/rigs/winradio/wr3700.c
@@ -37,7 +37,7 @@
 #define WR3700_MODES (RIG_MODE_AM | RIG_MODE_CW | \
                      RIG_MODE_USB | RIG_MODE_LSB | RIG_MODE_FM)
 
-const struct rig_caps wr3700_caps =
+struct rig_caps wr3700_caps =
 {
     RIG_MODEL(RIG_MODEL_WR3700),
     .model_name =     "WR-3700",
diff --git a/rigs/wj/wj.h b/rigs/wj/wj.h
index 6d77213f8..7813520a8 100644
--- a/rigs/wj/wj.h
+++ b/rigs/wj/wj.h
@@ -53,6 +53,6 @@ int wj_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width);
 int wj_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val);
 int wj_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val);
 
-extern const struct rig_caps wj8888_caps;
+extern struct rig_caps wj8888_caps;
 
 #endif /* _WJ_H */
diff --git a/rigs/wj/wj8888.c b/rigs/wj/wj8888.c
index 879dfe995..06a5980e5 100644
--- a/rigs/wj/wj8888.c
+++ b/rigs/wj/wj8888.c
@@ -49,7 +49,7 @@
  *
  * TODO: BFO
  */
-const struct rig_caps wj8888_caps =
+struct rig_caps wj8888_caps =
 {
     RIG_MODEL(RIG_MODEL_WJ8888),
     .model_name = "WJ-8888",
diff --git a/rigs/yaesu/frg100.c b/rigs/yaesu/frg100.c
index 8932dd108..f03702b54 100644
--- a/rigs/yaesu/frg100.c
+++ b/rigs/yaesu/frg100.c
@@ -147,7 +147,7 @@ static int mode2rig(RIG *rig, rmode_t mode, pbwidth_t width);
  *  - Dim
  */
 
-const struct rig_caps frg100_caps =
+struct rig_caps frg100_caps =
 {
     RIG_MODEL(RIG_MODEL_FRG100),
     .model_name =         "FRG-100",
diff --git a/rigs/yaesu/frg8800.c b/rigs/yaesu/frg8800.c
index a4c2f0cf4..79091efe3 100644
--- a/rigs/yaesu/frg8800.c
+++ b/rigs/yaesu/frg8800.c
@@ -49,7 +49,7 @@ static int frg8800_set_powerstat(RIG *rig, powerstat_t status);
  *
  */
 
-const struct rig_caps frg8800_caps =
+struct rig_caps frg8800_caps =
 {
     RIG_MODEL(RIG_MODEL_FRG8800),
     .model_name =         "FRG-8800",
diff --git a/rigs/yaesu/frg9600.c b/rigs/yaesu/frg9600.c
index 4f6002b1c..376b730dc 100644
--- a/rigs/yaesu/frg9600.c
+++ b/rigs/yaesu/frg9600.c
@@ -44,7 +44,7 @@ static int frg9600_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width);
  *
  */
 
-const struct rig_caps frg9600_caps =
+struct rig_caps frg9600_caps =
 {
     RIG_MODEL(RIG_MODEL_FRG9600),
     .model_name =         "FRG-9600",
diff --git a/rigs/yaesu/ft100.c b/rigs/yaesu/ft100.c
index d43c25df9..082a67cdf 100644
--- a/rigs/yaesu/ft100.c
+++ b/rigs/yaesu/ft100.c
@@ -309,7 +309,7 @@ static tone_t ft100_dcs_list[] =
             { 200, -54 }  /*  S0 */ \
             } }
 
-const struct rig_caps ft100_caps =
+struct rig_caps ft100_caps =
 {
     RIG_MODEL(RIG_MODEL_FT100),
     .model_name =     "FT-100",
diff --git a/rigs/yaesu/ft1000d.c b/rigs/yaesu/ft1000d.c
index 9cd013f6a..ab734fec0 100644
--- a/rigs/yaesu/ft1000d.c
+++ b/rigs/yaesu/ft1000d.c
@@ -262,7 +262,7 @@ struct ft1000d_priv_data
                 .flags = 1,      \
 }
 
-const struct rig_caps ft1000d_caps =
+struct rig_caps ft1000d_caps =
 {
 
     RIG_MODEL(RIG_MODEL_FT1000D),
diff --git a/rigs/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c
index f54790452..ae14a1548 100644
--- a/rigs/yaesu/ft1000mp.c
+++ b/rigs/yaesu/ft1000mp.c
@@ -308,7 +308,7 @@ struct ft1000mp_priv_data
  *
  */
 
-const struct rig_caps ft1000mp_caps =
+struct rig_caps ft1000mp_caps =
 {
     RIG_MODEL(RIG_MODEL_FT1000MP),
     .model_name =         "FT-1000MP",
@@ -451,7 +451,7 @@ const struct rig_caps ft1000mp_caps =
     .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
 };
 
-const struct rig_caps ft1000mpmkv_caps =
+struct rig_caps ft1000mpmkv_caps =
 {
     RIG_MODEL(RIG_MODEL_FT1000MPMKV),
     .model_name =         "MARK-V FT-1000MP",
@@ -594,7 +594,7 @@ const struct rig_caps ft1000mpmkv_caps =
     /* TODO: the remaining ... */
 };
 
-const struct rig_caps ft1000mpmkvfld_caps =
+struct rig_caps ft1000mpmkvfld_caps =
 {
     RIG_MODEL(RIG_MODEL_FT1000MPMKVFLD),
     .model_name =         "MARK-V Field FT-1000MP",
diff --git a/rigs/yaesu/ft1200.c b/rigs/yaesu/ft1200.c
index eca6c098f..cb6323242 100644
--- a/rigs/yaesu/ft1200.c
+++ b/rigs/yaesu/ft1200.c
@@ -142,7 +142,7 @@ int ftdx1200_ext_tokens[] =
 /*
  * FTDX 1200 rig capabilities
  */
-const struct rig_caps ftdx1200_caps =
+struct rig_caps ftdx1200_caps =
 {
     RIG_MODEL(RIG_MODEL_FTDX1200),
     .model_name =         "FTDX-1200",
diff --git a/rigs/yaesu/ft2000.c b/rigs/yaesu/ft2000.c
index c8fc41cbd..2d0c98b8d 100644
--- a/rigs/yaesu/ft2000.c
+++ b/rigs/yaesu/ft2000.c
@@ -127,7 +127,7 @@ int ft2000_ext_tokens[] =
 /*
  * FT-2000 rig capabilities
  */
-const struct rig_caps ft2000_caps =
+struct rig_caps ft2000_caps =
 {
     RIG_MODEL(RIG_MODEL_FT2000),
     .model_name =         "FT-2000",
diff --git a/rigs/yaesu/ft3000.c b/rigs/yaesu/ft3000.c
index 7774b7895..e3a2bd3e0 100644
--- a/rigs/yaesu/ft3000.c
+++ b/rigs/yaesu/ft3000.c
@@ -237,7 +237,7 @@ int ft3000_get_ant(RIG *rig, vfo_t vfo, ant_t dummy, value_t *option,
  * so this is just a copy of the FTDX 5000 caps.
  * It really needs to be reviewed for accuracy, but it works for WSJT-X.
  */
-const struct rig_caps ftdx3000_caps =
+struct rig_caps ftdx3000_caps =
 {
     RIG_MODEL(RIG_MODEL_FTDX3000),
     .model_name =         "FTDX-3000",
diff --git a/rigs/yaesu/ft450.c b/rigs/yaesu/ft450.c
index 5377211b9..ed5bfdd89 100644
--- a/rigs/yaesu/ft450.c
+++ b/rigs/yaesu/ft450.c
@@ -34,7 +34,7 @@
 /*
  * FT-450 rig capabilities
  */
-const struct rig_caps ft450_caps =
+struct rig_caps ft450_caps =
 {
     RIG_MODEL(RIG_MODEL_FT450),
     .model_name =         "FT-450",
diff --git a/rigs/yaesu/ft5000.c b/rigs/yaesu/ft5000.c
index d7421b280..8bfbb04f1 100644
--- a/rigs/yaesu/ft5000.c
+++ b/rigs/yaesu/ft5000.c
@@ -133,7 +133,7 @@ int ftdx5000_ext_tokens[] =
     TOK_BACKEND_NONE
 };
 
-const struct rig_caps ftdx5000_caps =
+struct rig_caps ftdx5000_caps =
 {
     RIG_MODEL(RIG_MODEL_FTDX5000),
     .model_name =         "FTDX-5000",
diff --git a/rigs/yaesu/ft600.c b/rigs/yaesu/ft600.c
index e1dfdd851..2e0d3aa24 100644
--- a/rigs/yaesu/ft600.c
+++ b/rigs/yaesu/ft600.c
@@ -219,7 +219,7 @@ static const yaesu_cmd_set_t ncmd[] =
             { 246,  60 } /* S9+60dB */  \
 }}
 
-const struct rig_caps ft600_caps =
+struct rig_caps ft600_caps =
 {
     RIG_MODEL(RIG_MODEL_FT600),
     .model_name =     "FT-600",
diff --git a/rigs/yaesu/ft710.c b/rigs/yaesu/ft710.c
index 792350806..188617515 100644
--- a/rigs/yaesu/ft710.c
+++ b/rigs/yaesu/ft710.c
@@ -114,7 +114,7 @@ int ft710_ext_tokens[] =
     TOK_BACKEND_NONE
 };
 
-const struct rig_caps ft710_caps =
+struct rig_caps ft710_caps =
 {
     RIG_MODEL(RIG_MODEL_FT710),
     .model_name =         "FT-710",
diff --git a/rigs/yaesu/ft736.c b/rigs/yaesu/ft736.c
index d37685036..f4bf6f4ea 100644
--- a/rigs/yaesu/ft736.c
+++ b/rigs/yaesu/ft736.c
@@ -92,7 +92,7 @@ static tone_t ft736_ctcss_list[] =
  *  - AQS
  */
 
-const struct rig_caps ft736_caps =
+struct rig_caps ft736_caps =
 {
     RIG_MODEL(RIG_MODEL_FT736R),
     .model_name =         "FT-736R",
diff --git a/rigs/yaesu/ft747.c b/rigs/yaesu/ft747.c
index d5c5f0f0f..5c5231606 100644
--- a/rigs/yaesu/ft747.c
+++ b/rigs/yaesu/ft747.c
@@ -296,7 +296,7 @@ struct ft747_priv_data
  * Also this struct is READONLY!
  */
 
-const struct rig_caps ft747_caps =
+struct rig_caps ft747_caps =
 {
     RIG_MODEL(RIG_MODEL_FT747),
     .model_name =       "FT-747GX",
diff --git a/rigs/yaesu/ft757gx.c b/rigs/yaesu/ft757gx.c
index 583795491..67f1d36d3 100644
--- a/rigs/yaesu/ft757gx.c
+++ b/rigs/yaesu/ft757gx.c
@@ -108,7 +108,7 @@ const struct confparams ft757gx_cfg_params[] =
  * ft757gx rig capabilities.
  * Also this struct is READONLY!
  */
-const struct rig_caps ft757gx_caps =
+struct rig_caps ft757gx_caps =
 {
     RIG_MODEL(RIG_MODEL_FT757),
     .model_name =       "FT-757GX",
@@ -225,7 +225,7 @@ const struct rig_caps ft757gx_caps =
  * ft757gx2 rig capabilities.
  * Also this struct is READONLY!
  */
-const struct rig_caps ft757gx2_caps =
+struct rig_caps ft757gx2_caps =
 {
     RIG_MODEL(RIG_MODEL_FT757GXII),
     .model_name =       "FT-757GXII",
diff --git a/rigs/yaesu/ft767gx.c b/rigs/yaesu/ft767gx.c
index 1b8ee0ae2..f5080ea0d 100644
--- a/rigs/yaesu/ft767gx.c
+++ b/rigs/yaesu/ft767gx.c
@@ -254,7 +254,7 @@ tone_t static_767gx_ctcss_list[] =
  * Also this struct is READONLY!
  */
 
-const struct rig_caps ft767gx_caps =
+struct rig_caps ft767gx_caps =
 {
     RIG_MODEL(RIG_MODEL_FT767),
     .model_name =       "FT-767GX",
diff --git a/rigs/yaesu/ft817.c b/rigs/yaesu/ft817.c
index 86258ddb2..291b0bcf3 100644
--- a/rigs/yaesu/ft817.c
+++ b/rigs/yaesu/ft817.c
@@ -289,7 +289,7 @@ enum ft817_digi
                 } }
 
 
-const struct rig_caps ft817_caps =
+struct rig_caps ft817_caps =
 {
     RIG_MODEL(RIG_MODEL_FT817),
     .model_name =          "FT-817",
@@ -439,7 +439,7 @@ const struct rig_caps ft817_caps =
     .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
 };
 
-const struct rig_caps ft818_caps =
+struct rig_caps ft818_caps =
 {
     RIG_MODEL(RIG_MODEL_FT818),
     .model_name =          "FT-818",
diff --git a/rigs/yaesu/ft840.c b/rigs/yaesu/ft840.c
index dc686e12a..ea68c868e 100644
--- a/rigs/yaesu/ft840.c
+++ b/rigs/yaesu/ft840.c
@@ -239,7 +239,7 @@ struct ft840_priv_data
  *
  */
 
-const struct rig_caps ft840_caps =
+struct rig_caps ft840_caps =
 {
     RIG_MODEL(RIG_MODEL_FT840),
     .model_name =         "FT-840",
diff --git a/rigs/yaesu/ft847.c b/rigs/yaesu/ft847.c
index d6ee0f66b..1eb4d293f 100644
--- a/rigs/yaesu/ft847.c
+++ b/rigs/yaesu/ft847.c
@@ -379,7 +379,7 @@ static tone_t ft650_ctcss_list[] =
  * Notice that some rigs share the same functions.
  */
 
-const struct rig_caps ft847_caps =
+struct rig_caps ft847_caps =
 {
     RIG_MODEL(RIG_MODEL_FT847),
     .model_name = "FT-847",
@@ -537,7 +537,7 @@ const struct rig_caps ft847_caps =
  * Notice that some rigs share the same functions.
  */
 
-const struct rig_caps ft650_caps =
+struct rig_caps ft650_caps =
 {
     RIG_MODEL(RIG_MODEL_FT650),
     .model_name = "FT-650",
@@ -675,7 +675,7 @@ const struct rig_caps ft650_caps =
     .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
 };
 
-const struct rig_caps mchfqrp_caps =
+struct rig_caps mchfqrp_caps =
 {
     RIG_MODEL(RIG_MODEL_MCHFQRP),
     .model_name = "mcHF QRP",
@@ -848,7 +848,7 @@ improvements. This version was made in May 1998. Later serial numbers (e.g.,
 8L09nnnn) all seem to have incorporated the earlier improvements plus new
 ones...."
  */
-const struct rig_caps ft847uni_caps =
+struct rig_caps ft847uni_caps =
 {
     RIG_MODEL(RIG_MODEL_FT847UNI),
     .model_name = "FT-847UNI",
diff --git a/rigs/yaesu/ft857.c b/rigs/yaesu/ft857.c
index d3d2981dd..c0e62ff85 100644
--- a/rigs/yaesu/ft857.c
+++ b/rigs/yaesu/ft857.c
@@ -239,7 +239,7 @@ enum ft857_digi
 
 static int ft857_send_icmd(RIG *rig, int index, const unsigned char *data);
 
-const struct rig_caps ft857_caps =
+struct rig_caps ft857_caps =
 {
     RIG_MODEL(RIG_MODEL_FT857),
     .model_name =     "FT-857",
diff --git a/rigs/yaesu/ft890.c b/rigs/yaesu/ft890.c
index 20f999ad3..e62abe350 100644
--- a/rigs/yaesu/ft890.c
+++ b/rigs/yaesu/ft890.c
@@ -391,7 +391,7 @@ struct ft890_priv_data
  *
  */
 
-const struct rig_caps ft890_caps =
+struct rig_caps ft890_caps =
 {
     RIG_MODEL(RIG_MODEL_FT890),
     .model_name =         "FT-890",
diff --git a/rigs/yaesu/ft891.c b/rigs/yaesu/ft891.c
index 2d5309344..e53579229 100644
--- a/rigs/yaesu/ft891.c
+++ b/rigs/yaesu/ft891.c
@@ -125,7 +125,7 @@ int ft891_ext_tokens[] =
 /*
  * FT-891 rig capabilities
  */
-const struct rig_caps ft891_caps =
+struct rig_caps ft891_caps =
 {
     RIG_MODEL(RIG_MODEL_FT891),
     .model_name =         "FT-891",
diff --git a/rigs/yaesu/ft897.c b/rigs/yaesu/ft897.c
index 026e7ea26..aa6c35cd5 100644
--- a/rigs/yaesu/ft897.c
+++ b/rigs/yaesu/ft897.c
@@ -245,7 +245,7 @@ enum ft897_digi
 #define FT897_VFO_ALL           (RIG_VFO_A|RIG_VFO_B)
 #define FT897_ANTS              0
 
-const struct rig_caps ft897_caps =
+struct rig_caps ft897_caps =
 {
     RIG_MODEL(RIG_MODEL_FT897),
     .model_name =     "FT-897",
@@ -393,7 +393,7 @@ const struct rig_caps ft897_caps =
     .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
 };
 
-const struct rig_caps ft897d_caps =
+struct rig_caps ft897d_caps =
 {
     RIG_MODEL(RIG_MODEL_FT897D),
     .model_name =     "FT-897D",
diff --git a/rigs/yaesu/ft900.c b/rigs/yaesu/ft900.c
index 36aeca19e..cbeddefda 100644
--- a/rigs/yaesu/ft900.c
+++ b/rigs/yaesu/ft900.c
@@ -413,7 +413,7 @@ struct ft900_priv_data
  *
  */
 
-const struct rig_caps ft900_caps =
+struct rig_caps ft900_caps =
 {
     RIG_MODEL(RIG_MODEL_FT900),
     .model_name =         "FT-900",
diff --git a/rigs/yaesu/ft9000.c b/rigs/yaesu/ft9000.c
index 7f5b61f85..831fc294b 100644
--- a/rigs/yaesu/ft9000.c
+++ b/rigs/yaesu/ft9000.c
@@ -41,7 +41,7 @@
  *
  */
 
-const struct rig_caps ft9000_caps =
+struct rig_caps ft9000_caps =
 {
     RIG_MODEL(RIG_MODEL_FT9000),
     .model_name =         "FTDX-9000",
@@ -217,7 +217,7 @@ const struct rig_caps ft9000_caps =
     .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS
 };
 
-const struct rig_caps ft9000Old_caps =
+struct rig_caps ft9000Old_caps =
 {
     RIG_MODEL(RIG_MODEL_FT9000OLD),
     .model_name =         "FTDX-9000 Old",
diff --git a/rigs/yaesu/ft920.c b/rigs/yaesu/ft920.c
index 68cc18877..097b3fb88 100644
--- a/rigs/yaesu/ft920.c
+++ b/rigs/yaesu/ft920.c
@@ -402,7 +402,7 @@ struct ft920_priv_data
  *
  */
 
-const struct rig_caps ft920_caps =
+struct rig_caps ft920_caps =
 {
     RIG_MODEL(RIG_MODEL_FT920),
     .model_name =       "FT-920",
diff --git a/rigs/yaesu/ft950.c b/rigs/yaesu/ft950.c
index 2ee973d55..4e7198663 100644
--- a/rigs/yaesu/ft950.c
+++ b/rigs/yaesu/ft950.c
@@ -77,7 +77,7 @@ int ft950_ext_tokens[] =
 /*
  * FT-950 rig capabilities
  */
-const struct rig_caps ft950_caps =
+struct rig_caps ft950_caps =
 {
     RIG_MODEL(RIG_MODEL_FT950),
     .model_name =         "FT-950",
diff --git a/rigs/yaesu/ft980.h b/rigs/yaesu/ft980.h
index 18192ec65..3d2b3f400 100644
--- a/rigs/yaesu/ft980.h
+++ b/rigs/yaesu/ft980.h
@@ -141,7 +141,7 @@ static int ft980_set_rptr_offs(RIG *rig, vfo_t vfo, shortfreq_t offs);
                       .width = 1,      \
   }
 
-const struct rig_caps ft980_caps =
+struct rig_caps ft980_caps =
 {
     RIG_MODEL(RIG_MODEL_FT980),
     .model_name =         "FT-980",
diff --git a/rigs/yaesu/ft990.c b/rigs/yaesu/ft990.c
index 5a2c9c5ce..ea64e44d5 100755
--- a/rigs/yaesu/ft990.c
+++ b/rigs/yaesu/ft990.c
@@ -230,7 +230,7 @@ struct ft990_priv_data
                 .flags = 1,      \
 }
 
-const struct rig_caps ft990_caps =
+struct rig_caps ft990_caps =
 {
     RIG_MODEL(RIG_MODEL_FT990),
     .model_name =         "FT-990",
diff --git a/rigs/yaesu/ft990v12.c b/rigs/yaesu/ft990v12.c
index eb445fad2..80fc2ef88 100644
--- a/rigs/yaesu/ft990v12.c
+++ b/rigs/yaesu/ft990v12.c
@@ -249,7 +249,7 @@ struct ft990v12_priv_data
 
 // Old FT990 ROM has to read all 1492 to get frequency
 // So for this model we just use the cache to read freq
-const struct rig_caps ft990uni_caps =
+struct rig_caps ft990uni_caps =
 {
     RIG_MODEL(RIG_MODEL_FT990UNI),
     .model_name =         "FT-990 Old Rom",
diff --git a/rigs/yaesu/ft991.c b/rigs/yaesu/ft991.c
index cd5ef0503..cc11f96a9 100644
--- a/rigs/yaesu/ft991.c
+++ b/rigs/yaesu/ft991.c
@@ -170,7 +170,7 @@ int ft991_ext_tokens[] =
 /*
  * FT-991 rig capabilities
  */
-const struct rig_caps ft991_caps =
+struct rig_caps ft991_caps =
 {
     RIG_MODEL(RIG_MODEL_FT991),
     .model_name =         "FT-991",
diff --git a/rigs/yaesu/ftdx10.c b/rigs/yaesu/ftdx10.c
index 65e9dade9..cd86fbc02 100644
--- a/rigs/yaesu/ftdx10.c
+++ b/rigs/yaesu/ftdx10.c
@@ -130,7 +130,7 @@ int ftdx10_ext_tokens[] =
     TOK_BACKEND_NONE
 };
 
-const struct rig_caps ftdx10_caps =
+struct rig_caps ftdx10_caps =
 {
     RIG_MODEL(RIG_MODEL_FTDX10),
     .model_name =         "FTDX-10",
diff --git a/rigs/yaesu/ftdx101.c b/rigs/yaesu/ftdx101.c
index 0473b7b85..3d08542d5 100644
--- a/rigs/yaesu/ftdx101.c
+++ b/rigs/yaesu/ftdx101.c
@@ -168,7 +168,7 @@ int ftdx101d_ext_tokens[] =
     TOK_BACKEND_NONE
 };
 
-const struct rig_caps ftdx101d_caps =
+struct rig_caps ftdx101d_caps =
 {
     RIG_MODEL(RIG_MODEL_FTDX101D),
     .model_name =         "FTDX-101D",
diff --git a/rigs/yaesu/ftdx101mp.c b/rigs/yaesu/ftdx101mp.c
index bf0cd4a0a..5289c09e9 100644
--- a/rigs/yaesu/ftdx101mp.c
+++ b/rigs/yaesu/ftdx101mp.c
@@ -71,7 +71,7 @@ int ftdx101mp_ext_tokens[] =
     TOK_ROOFING_FILTER, TOK_BACKEND_NONE
 };
 
-const struct rig_caps ftdx101mp_caps =
+struct rig_caps ftdx101mp_caps =
 {
     RIG_MODEL(RIG_MODEL_FTDX101MP),
     .model_name =         "FTDX-101MP",
diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 556e065d2..6635c2a33 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -928,7 +928,7 @@ int newcat_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
     char c;
     char target_vfo;
     int err;
-    const struct rig_caps *caps;
+    struct rig_caps *caps;
     struct newcat_priv_data *priv;
     int special_60m = 0;
     rmode_t tmode;
@@ -7884,7 +7884,7 @@ const char *newcat_get_info(RIG *rig)
 
 ncboolean newcat_valid_command(RIG *rig, char const *const command)
 {
-    const struct rig_caps *caps;
+    struct rig_caps *caps;
     int search_high;
     int search_low;
 
diff --git a/rigs/yaesu/vr5000.c b/rigs/yaesu/vr5000.c
index ba434c4aa..5de58053d 100644
--- a/rigs/yaesu/vr5000.c
+++ b/rigs/yaesu/vr5000.c
@@ -122,7 +122,7 @@ static int  check_tuning_step(RIG *rig, vfo_t vfo, rmode_t mode,
  * vr5000 rigs capabilities.
  */
 
-const struct rig_caps vr5000_caps =
+struct rig_caps vr5000_caps =
 {
     RIG_MODEL(RIG_MODEL_VR5000),
     .model_name =         "VR-5000",
diff --git a/rigs/yaesu/vx1700.c b/rigs/yaesu/vx1700.c
index 9a50d09f5..59be678da 100644
--- a/rigs/yaesu/vx1700.c
+++ b/rigs/yaesu/vx1700.c
@@ -207,7 +207,7 @@ struct vx1700_priv_data
         .width   = 1,   \
 }
 
-const struct rig_caps vx1700_caps =
+struct rig_caps vx1700_caps =
 {
     RIG_MODEL(RIG_MODEL_VX1700),
     .model_name =  "VX-1700",
diff --git a/rigs/yaesu/yaesu.h b/rigs/yaesu/yaesu.h
index 52b58775e..a0aa5a31e 100644
--- a/rigs/yaesu/yaesu.h
+++ b/rigs/yaesu/yaesu.h
@@ -45,52 +45,52 @@ struct yaesu_cmd_set {
 
 typedef struct yaesu_cmd_set yaesu_cmd_set_t;
 
-extern const struct rig_caps ft100_caps;
-extern const struct rig_caps ft450_caps;
+extern struct rig_caps ft100_caps;
+extern struct rig_caps ft450_caps;
 extern struct rig_caps ft450d_caps;
-extern const struct rig_caps ft736_caps;
-extern const struct rig_caps ft747_caps;
-extern const struct rig_caps ft757gx_caps;
-extern const struct rig_caps ft757gx2_caps;
-extern const struct rig_caps ft600_caps;
-extern const struct rig_caps ft767gx_caps;
-extern const struct rig_caps ft817_caps;
-extern const struct rig_caps ft857_caps;
-extern const struct rig_caps ft897_caps;
-extern const struct rig_caps ft897d_caps;
-extern const struct rig_caps ft847_caps;
-extern const struct rig_caps ft840_caps;
-extern const struct rig_caps ft890_caps;
-extern const struct rig_caps ft891_caps;
-extern const struct rig_caps ft900_caps;
-extern const struct rig_caps ft920_caps;
-extern const struct rig_caps ft950_caps;
-extern const struct rig_caps ft980_caps;
-extern const struct rig_caps ft990_caps;
-extern const struct rig_caps ft990uni_caps;
-extern const struct rig_caps ft991_caps;
-extern const struct rig_caps ft1000mp_caps;
-extern const struct rig_caps ft1000mpmkv_caps;
-extern const struct rig_caps ft1000mpmkvfld_caps;
-extern const struct rig_caps ft1000d_caps;
-extern const struct rig_caps ft2000_caps;
-extern const struct rig_caps ftdx3000_caps;
-extern const struct rig_caps ftdx5000_caps;
-extern const struct rig_caps ft9000_caps;
-extern const struct rig_caps frg100_caps;
-extern const struct rig_caps frg8800_caps;
-extern const struct rig_caps frg9600_caps;
-extern const struct rig_caps vr5000_caps;
-extern const struct rig_caps vx1700_caps;
-extern const struct rig_caps ftdx1200_caps;
-extern const struct rig_caps ft847uni_caps;
-extern const struct rig_caps ftdx101d_caps;
-extern const struct rig_caps ft818_caps;
-extern const struct rig_caps ftdx10_caps;
-extern const struct rig_caps ftdx101mp_caps;
-extern const struct rig_caps mchfqrp_caps;
-extern const struct rig_caps ft650_caps;
-extern const struct rig_caps ft710_caps;
-extern const struct rig_caps ft9000Old_caps;
+extern struct rig_caps ft736_caps;
+extern struct rig_caps ft747_caps;
+extern struct rig_caps ft757gx_caps;
+extern struct rig_caps ft757gx2_caps;
+extern struct rig_caps ft600_caps;
+extern struct rig_caps ft767gx_caps;
+extern struct rig_caps ft817_caps;
+extern struct rig_caps ft857_caps;
+extern struct rig_caps ft897_caps;
+extern struct rig_caps ft897d_caps;
+extern struct rig_caps ft847_caps;
+extern struct rig_caps ft840_caps;
+extern struct rig_caps ft890_caps;
+extern struct rig_caps ft891_caps;
+extern struct rig_caps ft900_caps;
+extern struct rig_caps ft920_caps;
+extern struct rig_caps ft950_caps;
+extern struct rig_caps ft980_caps;
+extern struct rig_caps ft990_caps;
+extern struct rig_caps ft990uni_caps;
+extern struct rig_caps ft991_caps;
+extern struct rig_caps ft1000mp_caps;
+extern struct rig_caps ft1000mpmkv_caps;
+extern struct rig_caps ft1000mpmkvfld_caps;
+extern struct rig_caps ft1000d_caps;
+extern struct rig_caps ft2000_caps;
+extern struct rig_caps ftdx3000_caps;
+extern struct rig_caps ftdx5000_caps;
+extern struct rig_caps ft9000_caps;
+extern struct rig_caps frg100_caps;
+extern struct rig_caps frg8800_caps;
+extern struct rig_caps frg9600_caps;
+extern struct rig_caps vr5000_caps;
+extern struct rig_caps vx1700_caps;
+extern struct rig_caps ftdx1200_caps;
+extern struct rig_caps ft847uni_caps;
+extern struct rig_caps ftdx101d_caps;
+extern struct rig_caps ft818_caps;
+extern struct rig_caps ftdx10_caps;
+extern struct rig_caps ftdx101mp_caps;
+extern struct rig_caps mchfqrp_caps;
+extern struct rig_caps ft650_caps;
+extern struct rig_caps ft710_caps;
+extern struct rig_caps ft9000Old_caps;
 
 #endif /* _YAESU_H */
diff --git a/src/conf.c b/src/conf.c
index ab9f6a1b3..612fa46c4 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -519,27 +519,27 @@ static int frontend_set_conf(RIG *rig, token_t token, const char *val)
         else if (!strcmp(val, "RIGMICDATA"))
         {
             rs->pttport.type.ptt = RIG_PTT_RIG_MICDATA;
-            rig->caps->ptt_type = RIG_PTT_RIG_MICDATA;
+            caps->ptt_type = RIG_PTT_RIG_MICDATA;
         }
         else if (!strcmp(val, "DTR"))
         {
             rs->pttport.type.ptt = RIG_PTT_SERIAL_DTR;
-            rig->caps->ptt_type = RIG_PTT_SERIAL_DTR;
+            caps->ptt_type = RIG_PTT_SERIAL_DTR;
         }
         else if (!strcmp(val, "RTS"))
         {
             rs->pttport.type.ptt = RIG_PTT_SERIAL_RTS;
-            rig->caps->ptt_type = RIG_PTT_SERIAL_RTS;
+            caps->ptt_type = RIG_PTT_SERIAL_RTS;
         }
         else if (!strcmp(val, "Parallel"))
         {
             rs->pttport.type.ptt = RIG_PTT_PARALLEL;
-            rig->caps->ptt_type = RIG_PTT_PARALLEL;
+            caps->ptt_type = RIG_PTT_PARALLEL;
         }
         else if (!strcmp(val, "CM108"))
         {
             rs->pttport.type.ptt = RIG_PTT_CM108;
-            rig->caps->ptt_type = RIG_PTT_CM108;
+            caps->ptt_type = RIG_PTT_CM108;
         }
         else if (!strcmp(val, "GPIO"))
         {
@@ -548,11 +548,12 @@ static int frontend_set_conf(RIG *rig, token_t token, const char *val)
         else if (!strcmp(val, "GPION"))
         {
             rs->pttport.type.ptt = RIG_PTT_GPION;
-            rig->caps->ptt_type = RIG_PTT_GPION;
+            caps->ptt_type = RIG_PTT_GPION;
         }
         else if (!strcmp(val, "None"))
         {
             rs->pttport.type.ptt = RIG_PTT_NONE;
+            caps->ptt_type = RIG_PTT_NONE;
         }
         else
         {
diff --git a/src/misc.c b/src/misc.c
index 2e2837050..95ae02cd5 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -2011,11 +2011,11 @@ vfo_t HAMLIB_API vfo_fixup(RIG *rig, vfo_t vfo, split_t split)
     if (rig->caps->rig_model == RIG_MODEL_ID5100
         || rig->caps->rig_model == RIG_MODEL_IC9700)
     {
+        struct rig_state *rs = &rig->state;
         // dualwatch on ID5100 is TX=Main, RX=Sub
-        struct icom_priv_data *icom_priv = (struct icom_priv_data *)rig->caps->priv;
-        if (rig->caps->rig_model == RIG_MODEL_ID5100 && icom_priv->dual_watch)
+        if (rig->caps->rig_model == RIG_MODEL_ID5100 && rs->dual_watch)
         {
-            if (vfo == RIG_VFO_TX) return RIG_VFO_MAIN;
+            if (vfo == RIG_VFO_TX || vfo == RIG_VFO_MAIN) return RIG_VFO_MAIN;
             return RIG_VFO_SUB;
         }
         return vfo; // no change to requested vfo
diff --git a/src/register.c b/src/register.c
index 2808a797a..a47adf10d 100644
--- a/src/register.c
+++ b/src/register.c
@@ -161,7 +161,7 @@ static struct
 //! @cond Doxygen_Suppress
 struct rig_list
 {
-    const struct rig_caps *caps;
+    struct rig_caps *caps;
     struct rig_list *next;
 };
 //! @endcond
@@ -189,7 +189,7 @@ static int rig_lookup_backend(rig_model_t rig_model);
  * Basically, this is a hash insert function that doesn't check for dup!
  */
 //! @cond Doxygen_Suppress
-int HAMLIB_API rig_register(const struct rig_caps *caps)
+int HAMLIB_API rig_register(struct rig_caps *caps)
 {
     int hval;
     struct rig_list *p;
@@ -239,7 +239,7 @@ int HAMLIB_API rig_register(const struct rig_caps *caps)
  */
 
 //! @cond Doxygen_Suppress
-const struct rig_caps *HAMLIB_API rig_get_caps(rig_model_t rig_model)
+struct rig_caps *HAMLIB_API rig_get_caps(rig_model_t rig_model)
 {
     struct rig_list *p;
 
@@ -389,7 +389,7 @@ int HAMLIB_API rig_unregister(rig_model_t rig_model)
  * executes cfunc on all the elements stored in the rig hash list
  */
 //! @cond Doxygen_Suppress
-int HAMLIB_API rig_list_foreach(int (*cfunc)(const struct rig_caps *,
+int HAMLIB_API rig_list_foreach(int (*cfunc)(struct rig_caps *,
                                 rig_ptr_t),
                                 rig_ptr_t data)
 {
diff --git a/src/rig.c b/src/rig.c
index 0d6ea168e..9dec89c4e 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -880,7 +880,7 @@ RIG *HAMLIB_API rig_init(rig_model_t rig_model)
  */
 int HAMLIB_API rig_open(RIG *rig)
 {
-    const struct rig_caps *caps;
+    struct rig_caps *caps;
     struct rig_state *rs;
     int status = RIG_OK;
     value_t parm_value;
diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index 9c6b215b0..9908f0d72 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -2018,7 +2018,7 @@ int print_conf_list2(const struct confparams *cfp, rig_ptr_t data)
     return 1;  /* !=0, we want them all ! */
 }
 
-static int hash_model_list(const struct rig_caps *caps, void *data)
+static int hash_model_list(struct rig_caps *caps, void *data)
 {
     hash_add_model(caps->rig_model,
                    caps->mfg_name,