diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index 6fcf89f61..c14c1fd14 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -832,7 +832,7 @@ typedef enum {
 /**
  * \brief configuration token
  */
-typedef long token_t;
+typedef unsigned long long token_t;
 
 
 //! @cond Doxygen_Suppress
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index b6b3cdfd1..03474d900 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -4588,7 +4588,7 @@ int icom_set_ext_level(RIG *rig, vfo_t vfo, token_t token, value_t val)
     int lvl_cn, lvl_sc;       /* Command Number, Subcommand */
     int i, retval;
 
-    rig_debug(RIG_DEBUG_VERBOSE, "%s called: token=%ld int=%d float=%f\n", __func__,
+    rig_debug(RIG_DEBUG_VERBOSE, "%s called: token=%lld int=%d float=%f\n", __func__,
               token, val.i, val.f);
 
     switch (token)
@@ -4699,7 +4699,7 @@ int icom_set_ext_level(RIG *rig, vfo_t vfo, token_t token, value_t val)
             else { i++; }
         }
 
-        rig_debug(RIG_DEBUG_ERR, "%s: unsupported set_ext_level token: %ld\n", __func__,
+        rig_debug(RIG_DEBUG_ERR, "%s: unsupported set_ext_level token: %lld\n", __func__,
                   token);
         RETURNFUNC2(-RIG_EINVAL);
     }
@@ -4806,7 +4806,7 @@ int icom_get_ext_level(RIG *rig, vfo_t vfo, token_t token, value_t *val)
             else { i++; }
         }
 
-        rig_debug(RIG_DEBUG_ERR, "%s: unsupported get_ext_level token: %ld\n", __func__,
+        rig_debug(RIG_DEBUG_ERR, "%s: unsupported get_ext_level token: %lld\n", __func__,
                   token);
         RETURNFUNC(-RIG_EINVAL);
     }
diff --git a/rotators/grbltrk/grbltrk.c b/rotators/grbltrk/grbltrk.c
index 100ca0728..3fbe1791d 100644
--- a/rotators/grbltrk/grbltrk.c
+++ b/rotators/grbltrk/grbltrk.c
@@ -408,7 +408,7 @@ grbltrk_rot_set_conf(ROT *rot, token_t token, const char *val)
 {
     uint32_t resp_size, len;
 
-    rot_debug(RIG_DEBUG_ERR, "token: %ld; value: [%s]\n", token, val);
+    rot_debug(RIG_DEBUG_ERR, "token: %lld; value: [%s]\n", token, val);
 
     len = strlen(val);
 
diff --git a/src/amp_conf.c b/src/amp_conf.c
index e47d7d1ef..cda139d3e 100644
--- a/src/amp_conf.c
+++ b/src/amp_conf.c
@@ -694,7 +694,7 @@ int HAMLIB_API amp_set_conf(AMP *amp, token_t token, const char *val)
     {
         const struct confparams *cfp;
         char tokenstr[12];
-        SNPRINTF(tokenstr, sizeof(tokenstr), "%ld", token);
+        SNPRINTF(tokenstr, sizeof(tokenstr), "%lld", token);
         cfp = amp_confparam_lookup(amp, tokenstr);
 
         if (!cfp)
diff --git a/src/conf.c b/src/conf.c
index cc9291e3a..997a91fa1 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1287,7 +1287,7 @@ int HAMLIB_API rig_set_conf(RIG *rig, token_t token, const char *val)
     {
         const struct confparams *cfp;
         char tokenstr[12];
-        SNPRINTF(tokenstr, sizeof(tokenstr), "%ld", token);
+        SNPRINTF(tokenstr, sizeof(tokenstr), "%lld", token);
         cfp = rig_confparam_lookup(rig, tokenstr);
 
         if (!cfp)
diff --git a/src/rot_conf.c b/src/rot_conf.c
index bfb9a2527..fce0d237b 100644
--- a/src/rot_conf.c
+++ b/src/rot_conf.c
@@ -759,7 +759,7 @@ int HAMLIB_API rot_set_conf(ROT *rot, token_t token, const char *val)
     {
         const struct confparams *cfp;
         char tokenstr[32];
-        SNPRINTF(tokenstr, sizeof(tokenstr), "%ld", token);
+        SNPRINTF(tokenstr, sizeof(tokenstr), "%lld", token);
         cfp = rot_confparam_lookup(rot, tokenstr);
 
         if (!cfp)