diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index fb4c2013c..0add58527 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -358,6 +358,8 @@ typedef int vfo_t;
 #define RIG_TARGETABLE_FREQ (1<<0)
 #define RIG_TARGETABLE_MODE (1<<1)
 #define RIG_TARGETABLE_PURE (1<<2)
+#define RIG_TARGETABLE_TONE (1<<3)
+#define RIG_TARGETABLE_FUNC (1<<4)
 #define RIG_TARGETABLE_ALL  0x7fffffff
 
 
diff --git a/src/settings.c b/src/settings.c
index 44dfd47ce..a986cf404 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -7,14 +7,14 @@
  * \file settings.c
  * \brief func/level/parm interface
  * \author Stephane Fillod
- * \date 2000-2009
+ * \date 2000-2010
  *
  * Hamlib interface is a frontend implementing wrapper functions.
  */
 
 /*
  *  Hamlib Interface - func/level/parm
- *  Copyright (c) 2000-2009 by Stephane Fillod
+ *  Copyright (c) 2000-2010 by Stephane Fillod
  *
  *	$Id: settings.c,v 1.14 2009-02-20 12:26:13 fillods Exp $
  *
@@ -409,7 +409,7 @@ int HAMLIB_API rig_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
 	if (caps->set_func == NULL || !rig_has_set_func(rig,func))
 		return -RIG_ENAVAIL;
 
-	if ((caps->targetable_vfo&RIG_TARGETABLE_PURE) ||
+	if ((caps->targetable_vfo&RIG_TARGETABLE_FUNC) ||
 			vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
 		return caps->set_func(rig, vfo, func, status);
 
@@ -458,7 +458,7 @@ int HAMLIB_API rig_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
 	if (caps->get_func == NULL || !rig_has_get_func(rig,func))
 		return -RIG_ENAVAIL;
 
-	if ((caps->targetable_vfo&RIG_TARGETABLE_PURE) ||
+	if ((caps->targetable_vfo&RIG_TARGETABLE_FUNC) ||
 			vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
 		return caps->get_func(rig, vfo, func, status);
 
diff --git a/src/tones.c b/src/tones.c
index 952820fc7..f2c5427cf 100644
--- a/src/tones.c
+++ b/src/tones.c
@@ -7,11 +7,11 @@
  * \file src/tones.c
  * \brief CTCSS and DCS interface and tables
  * \author Stephane Fillod
- * \date 2000-2009
+ * \date 2000-2010
  */
 /*
  *  Hamlib Interface - CTCSS and DCS interface and tables
- *  Copyright (c) 2000-2009 by Stephane Fillod
+ *  Copyright (c) 2000-2010 by Stephane Fillod
  *
  *	$Id: tones.c,v 1.11 2009-02-20 12:26:13 fillods Exp $
  *
@@ -110,7 +110,7 @@ int HAMLIB_API rig_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone)
 	if (caps->set_ctcss_tone == NULL)
 		return -RIG_ENAVAIL;
 
-	if ((caps->targetable_vfo&RIG_TARGETABLE_PURE) || 
+	if ((caps->targetable_vfo&RIG_TARGETABLE_TONE) || 
 				vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
 		return caps->set_ctcss_tone(rig, vfo, tone);
 
@@ -159,7 +159,7 @@ int HAMLIB_API rig_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
 	if (caps->get_ctcss_tone == NULL)
 		return -RIG_ENAVAIL;
 
-	if ((caps->targetable_vfo&RIG_TARGETABLE_PURE) || 
+	if ((caps->targetable_vfo&RIG_TARGETABLE_TONE) || 
 				vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
 		return caps->get_ctcss_tone(rig, vfo, tone);
 
@@ -204,7 +204,7 @@ int HAMLIB_API rig_set_dcs_code(RIG *rig, vfo_t vfo, tone_t code)
 	if (caps->set_dcs_code == NULL)
 		return -RIG_ENAVAIL;
 
-	if ((caps->targetable_vfo&RIG_TARGETABLE_PURE) || 
+	if ((caps->targetable_vfo&RIG_TARGETABLE_TONE) || 
 				vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
 		return caps->set_dcs_code(rig, vfo, code);
 
@@ -248,7 +248,7 @@ int HAMLIB_API rig_get_dcs_code(RIG *rig, vfo_t vfo, tone_t *code)
 	if (caps->get_dcs_code == NULL)
 		return -RIG_ENAVAIL;
 
-	if ((caps->targetable_vfo&RIG_TARGETABLE_PURE) || 
+	if ((caps->targetable_vfo&RIG_TARGETABLE_TONE) || 
 				vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
 		return caps->get_dcs_code(rig, vfo, code);
 
@@ -298,7 +298,7 @@ int HAMLIB_API rig_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone)
 	if (caps->set_ctcss_sql == NULL)
 		return -RIG_ENAVAIL;
 
-	if ((caps->targetable_vfo&RIG_TARGETABLE_PURE) || 
+	if ((caps->targetable_vfo&RIG_TARGETABLE_TONE) || 
 				vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
 		return caps->set_ctcss_sql(rig, vfo, tone);
 
@@ -347,7 +347,7 @@ int HAMLIB_API rig_get_ctcss_sql(RIG *rig, vfo_t vfo, tone_t *tone)
 	if (caps->get_ctcss_sql == NULL)
 		return -RIG_ENAVAIL;
 
-	if ((caps->targetable_vfo&RIG_TARGETABLE_PURE) ||
+	if ((caps->targetable_vfo&RIG_TARGETABLE_TONE) ||
 			vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
 		return caps->get_ctcss_sql(rig, vfo, tone);
 
@@ -392,7 +392,7 @@ int HAMLIB_API rig_set_dcs_sql(RIG *rig, vfo_t vfo, tone_t code)
 	if (caps->set_dcs_sql == NULL)
 		return -RIG_ENAVAIL;
 
-	if ((caps->targetable_vfo&RIG_TARGETABLE_PURE) ||
+	if ((caps->targetable_vfo&RIG_TARGETABLE_TONE) ||
 			vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
 		return caps->set_dcs_sql(rig, vfo, code);
 
@@ -436,7 +436,7 @@ int HAMLIB_API rig_get_dcs_sql(RIG *rig, vfo_t vfo, tone_t *code)
 	if (caps->get_dcs_sql == NULL)
 		return -RIG_ENAVAIL;
 
-	if ((caps->targetable_vfo&RIG_TARGETABLE_PURE) ||
+	if ((caps->targetable_vfo&RIG_TARGETABLE_TONE) ||
 			vfo == RIG_VFO_CURR || vfo == rig->state.current_vfo)
 		return caps->get_dcs_sql(rig, vfo, code);