diff --git a/kenwood/Makefile.am b/kenwood/Makefile.am
index f880c3407..09c8ad9bd 100644
--- a/kenwood/Makefile.am
+++ b/kenwood/Makefile.am
@@ -2,7 +2,7 @@ TSSRCLIST = ts850.c ts870s.c ts570.c ts450s.c ts950.c ts50s.c \
 				ts790.c thd7.c thf7.c
 
 lib_LTLIBRARIES = libhamlib-kenwood.la
-libhamlib_kenwood_la_SOURCES = $(TSSRCLIST) kenwood.c th.c
+libhamlib_kenwood_la_SOURCES = $(TSSRCLIST) kenwood.c th.c ts2k.c
 libhamlib_kenwood_la_LDFLAGS = -no-undefined -module -version-info 0:0:0
 libhamlib_kenwood_la_LIBADD = ../src/libhamlib.la
 
diff --git a/kenwood/Makefile.in b/kenwood/Makefile.in
index 0ca674894..4b453d6ef 100644
--- a/kenwood/Makefile.in
+++ b/kenwood/Makefile.in
@@ -1,6 +1,7 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -12,7 +13,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -43,9 +43,12 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
@@ -57,6 +60,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
@@ -70,7 +77,6 @@ CXX = @CXX@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 ECHO = @ECHO@
-EXEEXT = @EXEEXT@
 INCLTDL = @INCLTDL@
 INCLUDES = @INCLUDES@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -82,7 +88,6 @@ MATH_LIBS = @MATH_LIBS@
 NET = @NET@
 NET_LIBS = @NET_LIBS@
 OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 RIGMATRIX = @RIGMATRIX@
@@ -100,17 +105,16 @@ am__quote = @am__quote@
 cf_with_perl = @cf_with_perl@
 hamlibdocdir = @hamlibdocdir@
 install_sh = @install_sh@
-
-TSSRCLIST = ts850.c ts870s.c ts570.c ts450s.c ts2000.c ts950.c ts50s.c \
+TSSRCLIST = ts850.c ts870s.c ts570.c ts450s.c ts950.c ts50s.c \
 				ts790.c thd7.c thf7.c
 
 
 lib_LTLIBRARIES = libhamlib-kenwood.la
-libhamlib_kenwood_la_SOURCES = $(TSSRCLIST) kenwood.c th.c
+libhamlib_kenwood_la_SOURCES = $(TSSRCLIST) kenwood.c th.c ts2k.c
 libhamlib_kenwood_la_LDFLAGS = -no-undefined -module -version-info 0:0:0
 libhamlib_kenwood_la_LIBADD = ../src/libhamlib.la
 
-noinst_HEADERS = kenwood.h th.h
+noinst_HEADERS = kenwood.h th.h ts2k.h ts2000.h
 subdir = kenwood
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/include/config.h
@@ -118,9 +122,10 @@ CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(lib_LTLIBRARIES)
 
 libhamlib_kenwood_la_DEPENDENCIES = ../src/libhamlib.la
-am_libhamlib_kenwood_la_OBJECTS = ts850.lo ts870s.lo ts570.lo ts450s.lo \
-	ts2000.lo ts950.lo ts50s.lo ts790.lo thd7.lo thf7.lo kenwood.lo \
-	th.lo
+am__objects_1 = ts850.lo ts870s.lo ts570.lo ts450s.lo ts950.lo ts50s.lo \
+	ts790.lo thd7.lo thf7.lo
+am_libhamlib_kenwood_la_OBJECTS = $(am__objects_1) kenwood.lo th.lo \
+	ts2k.lo
 libhamlib_kenwood_la_OBJECTS = $(am_libhamlib_kenwood_la_OBJECTS)
 
 DEFS = @DEFS@
@@ -129,12 +134,13 @@ CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kenwood.Plo $(DEPDIR)/th.Plo \
-@AMDEP_TRUE@	$(DEPDIR)/thd7.Plo $(DEPDIR)/thf7.Plo \
-@AMDEP_TRUE@	$(DEPDIR)/ts2000.Plo $(DEPDIR)/ts450s.Plo \
-@AMDEP_TRUE@	$(DEPDIR)/ts50s.Plo $(DEPDIR)/ts570.Plo \
-@AMDEP_TRUE@	$(DEPDIR)/ts790.Plo $(DEPDIR)/ts850.Plo \
-@AMDEP_TRUE@	$(DEPDIR)/ts870s.Plo $(DEPDIR)/ts950.Plo
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kenwood.Plo ./$(DEPDIR)/th.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/thd7.Plo ./$(DEPDIR)/thf7.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ts2k.Plo ./$(DEPDIR)/ts450s.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ts50s.Plo ./$(DEPDIR)/ts570.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ts790.Plo ./$(DEPDIR)/ts850.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/ts870s.Plo ./$(DEPDIR)/ts950.Plo
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -153,35 +159,27 @@ all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  kenwood/Makefile
 Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && \
-	  CONFIG_HEADERS= CONFIG_LINKS= \
-	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+libLTLIBRARIES_INSTALL = $(INSTALL)
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(libdir)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \
-	    $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \
+	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
 	  else :; fi; \
 	done
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	    p="`echo $$p | sed -e 's|^.*/||'`"; \
 	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
 	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
 	done
@@ -197,27 +195,27 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kenwood.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/th.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/thd7.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/thf7.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ts2000.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ts450s.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ts50s.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ts570.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ts790.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ts850.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ts870s.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ts950.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kenwood.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/th.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thd7.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thf7.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ts2k.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ts450s.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ts50s.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ts570.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ts790.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ts850.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ts870s.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ts950.Plo@am__quote@
 
 distclean-depend:
-	-rm -rf $(DEPDIR)
+	-rm -rf ./$(DEPDIR)
 
 .c.o:
 @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
+	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
 
 .c.obj:
 @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@@ -229,42 +227,54 @@ distclean-depend:
 @AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
+	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
 CCDEPMODE = @CCDEPMODE@
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
 uninstall-info-am:
 
+ETAGS = etags
+ETAGSFLAGS =
+
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique $(LISP)
+	mkid -fID $$unique
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
 
 GTAGS:
-	here=`CDPATH=: && cd $(top_builddir) && pwd` \
+	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ..
@@ -272,14 +282,19 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
 	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pR $$d/$$file $(distdir) \
-	    || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || cp -p $$d/$$file $(distdir)/$$file \
@@ -304,6 +319,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
diff --git a/kenwood/ts2k.c b/kenwood/ts2k.c
index 900f97d0b..6e3762ee7 100644
--- a/kenwood/ts2k.c
+++ b/kenwood/ts2k.c
@@ -2,7 +2,7 @@
  *  Hamlib Kenwood backend - TS2000 description
  *  Copyright (c) 2000-2002 by Stephane Fillod
  *
- *		$Id: ts2k.c,v 1.3 2002-06-29 08:42:29 dedmons Exp $
+ *		$Id: ts2k.c,v 1.4 2002-06-29 09:54:50 dedmons Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -65,7 +65,7 @@
  *  Hamlib Kenwood backend - main file
  *  Copyright (c) 2000-2002 by Stephane Fillod
  *
- *		$Id: ts2k.c,v 1.3 2002-06-29 08:42:29 dedmons Exp $
+ *		$Id: ts2k.c,v 1.4 2002-06-29 09:54:50 dedmons Exp $
  */
 
 
@@ -157,7 +157,7 @@ const int ts2k_ctcss_list[] = {
 	670, 719, 744, 770, 797, 825, 854, 885, 915, 948,
 	974, 1000, 1035, 1072, 1109, 1148, 1188, 1230, 1273, 1318,
 	1365, 1413, 1462, 1514, 1567, 1622, 1679, 1738, 1799, 1862,
-	1928, 2035, 2107, 2181, 2257, 2336, 2418, 2503, // 17500,
+	1928, 2035, 2107, 2181, 2257, 2336, 2418, 2503, 17500,
 	/* Note: 17500 is not available as ctcss, only tone. --kd7eni */
 	0,
 };
@@ -2269,9 +2269,9 @@ int ts2k_get_rptr_shift(RIG * rig, vfo_t vfo, rptr_shift_t * rptr_shift)
 	case '2':
 		*rptr_shift = RIG_RPT_SHIFT_PLUS;
 		break;
-	case '3':
-		*rptr_shift = RIG_RPT_SHIFT_1750;
-		break;
+//	case '3':
+//		*rptr_shift = RIG_RPT_SHIFT_1750;
+//		break;
 
 	default:
 		return -RIG_EINVAL;
diff --git a/kenwood/ts2k.h b/kenwood/ts2k.h
index 2f3d3c6e7..3a319b030 100644
--- a/kenwood/ts2k.h
+++ b/kenwood/ts2k.h
@@ -2,7 +2,7 @@
  *  Hamlib TS2000 backend - main header
  *  Copyright (c) 2000-2002 by Stephane Fillod
  *
- *		$Id: ts2k.h,v 1.1 2002-06-27 08:55:56 dedmons Exp $
+ *		$Id: ts2k.h,v 1.2 2002-06-29 09:54:50 dedmons Exp $
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
@@ -174,3 +174,125 @@ extern BACKEND_EXPORT(rig_model_t) proberigs_ts2k(port_t *port);
 
 
 #endif /* _TS2000_H */
+
+
+/************** Temporary local copy of rig.h *************************/
+
+
+
+#ifndef _RIG_H_TEMP
+#define _RIG_H_TEMP 1
+
+#define RIG_RPT_SHIFT_1750 (RIG_RPT_SHIFT_PLUS + 1)
+
+/*
+ * I've cleaned up the VFO definition to make it easier to change
+ * when the MoonMelter is finally released.  Essentially, I've
+ * done nothing.	--Dale	:)
+ */
+
+/*
+ * Upper segment: "rig Major"
+ * Lower segment: "VFO minor"
+ *
+ *	MSB		    LSB
+ *	N	n+1 n	      0
+ *	+-+-+-+-+-+-+-+-+-+-+-+
+ *	|	   |	      |
+ *	    Rig		VFO
+ *	   Major       minor
+ */
+//typedef unsigned int vfo_t;
+
+#define BIT(a)	( ((vfo_t) 1) << (a))
+//#define BIT(a)	(1L << (a))
+
+#define RIG_MINOR	3
+/* M=Major, m=minor */
+#define RIG_SET_VFO(M,m)	((vfo_t) ( ((M) << (RIG_MINOR+1)) | (m) ))
+/* Note: prior definition exibited exponential growth in bit count */
+
+#define RIG_VFO_RESERVED	RIG_SET_VFO(0, BIT(0))
+#define RIG_VFO_RESERVED2	RIG_SET_VFO(0, BIT(1))
+
+/* VFO Minor */
+#define RIG_VFO1	RIG_SET_VFO(0, BIT(2))
+#define RIG_VFO2	RIG_SET_VFO(0, BIT(3))
+#define RIG_VFO3	RIG_SET_VFO(0, BIT(4))
+/*					   |
+ * RIG_MINOR = n :== MAX >-----------------'
+ */
+
+/* Rig Major */
+#define RIG_CTRL_MAIN	RIG_SET_VFO(BIT(0), 0)
+#define RIG_CTRL_SUB	RIG_SET_VFO(BIT(1), 0)
+#define RIG_CTRL_MEM	RIG_SET_VFO(BIT(2), 0)
+
+/* Standard VFO's for common use */
+#define RIG_VFO_A	(RIG_CTRL_MAIN | RIG_VFO1)
+#define RIG_VFO_B	(RIG_CTRL_MAIN | RIG_VFO2)
+#define RIG_VFO_C	(RIG_CTRL_SUB  | RIG_VFO1)
+#define RIG_VFO_MEM	RIG_CTRL_MEM
+/* VFOC should be VFO3 because ambiguities may arise someday */
+
+/* VFO stuff that may be handy. */
+#define RIG_VFO_MASK	(RIG_VFO1 | RIG_VFO2 | RIG_VFO3)
+#define RIG_CTRL_MASK	(RIG_CTRL_MAIN | RIG_CTRL_SUB | RIG_CTRL_MEM)
+#define RIG_VFO_VALID	(RIG_CTRL_MASK | RIG_VFO_MASK)
+#define RIG_VFO_TEST(v)	(((v) & RIG_VFO_VALID) != 0)
+
+/* The following are for compatibility with existing code! */
+#define RIG_VFO_NONE	(~RIG_VFO_VALID)
+#define RIG_VFO_CURR	RIG_SET_VFO(0,0)
+#define RIG_VFO_ALL	RIG_VFO_MASK
+#define RIG_VFO_MAIN	RIG_CTRL_MAIN
+#define RIG_VFO_SUB	RIG_CTRL_SUB
+#define RIG_VFO_VFO	(RIG_VFO_VALID & ~RIG_VFO_MEM)
+/*
+ * Ahhh.  Now I can live happy and die free! --Dale
+ */
+
+#define RIG_SCAN_VFO	(1L<<4)		/* most basic of scans! */
+
+#define RIG_SCAN_ALL	(RIG_SCAN_STOP | RIG_SCAN_MEM | RIG_SCAN_SLCT \
+			| RIG_SCAN_PRIO | RIG_SCAN_PROG | RIG_SCAN_DELTA \
+			| RIG_SCAN_VFO)
+#define RIG_SCAN_EXCLUDE(e) (RIG_SCAN_ALL & ~(e))
+
+/* There's no reason for every back-end to write huge lists.  The guys
+ * with about 50% features still have some work.  Someone that knows
+ * many rigs should make RIG_LEVEL_COMMON, RIG_FUNC_COMMON	--Dale
+ */
+#define RIG_LEVEL_ALL	(RIG_LEVEL_PREAMP | RIG_LEVEL_ATT | RIG_LEVEL_VOX \
+			| RIG_LEVEL_AF | RIG_LEVEL_RF | RIG_LEVEL_SQL \
+	| RIG_LEVEL_IF | RIG_LEVEL_APF | RIG_LEVEL_NR | RIG_LEVEL_PBT_IN \
+	| RIG_LEVEL_PBT_OUT | RIG_LEVEL_CWPITCH | RIG_LEVEL_RFPOWER \
+	| RIG_LEVEL_MICGAIN | RIG_LEVEL_KEYSPD | RIG_LEVEL_NOTCHF \
+	| RIG_LEVEL_COMP | RIG_LEVEL_AGC | RIG_LEVEL_BKINDL \
+	| RIG_LEVEL_BALANCE | RIG_LEVEL_METER | RIG_LEVEL_VOXGAIN \
+	| RIG_LEVEL_VOXDELAY | RIG_LEVEL_ANTIVOX | RIG_LEVEL_SQLSTAT \
+	| RIG_LEVEL_SWR | RIG_LEVEL_ALC | RIG_LEVEL_STRENGTH )
+
+/* simplification macro */
+#define RIG_LEVEL_EXCLUDE(e) (RIG_LEVEL_ALL & ~(e))
+
+/* more simplification macros */
+#define RIG_PARM_ALL	(RIG_PARM_ANN | RIG_PARM_APO | RIG_PARM_BACKLIGHT \
+			| RIG_PARM_BEEP | RIG_PARM_TIME | RIG_PARM_BAT )
+#define RIG_PARM_EXCLUDE(e)	(RIG_PARM_ALL & ~(e))
+
+/* For the Ham who has it all  --Dale */
+#define RIG_FUNC_ALL	(RIG_FUNC_FAGC | RIG_FUNC_NB | RIG_FUNC_COMP \
+			| RIG_FUNC_VOX | RIG_FUNC_TONE | RIG_FUNC_TSQL \
+	| RIG_FUNC_SBKIN | RIG_FUNC_FBKIN | RIG_FUNC_ANF | RIG_FUNC_NR \
+	| RIG_FUNC_AIP | RIG_FUNC_APF | RIG_FUNC_MON | RIG_FUNC_MN \
+	| RIG_FUNC_RNF | RIG_FUNC_ARO | RIG_FUNC_LOCK | RIG_FUNC_MUTE \
+	| RIG_FUNC_VSC | RIG_FUNC_REV | RIG_FUNC_SQL | RIG_FUNC_ABM \
+	| RIG_FUNC_BC | RIG_FUNC_MBC | RIG_FUNC_LMP | RIG_FUNC_AFC \
+	| RIG_FUNC_SATMODE | RIG_FUNC_SCOPE | RIG_FUNC_RESUME )
+
+/* Those of us who don't have everything */
+//#define RIG_FUNC_EXCLUDE(f)	(RIG_FUNC_ALL & ~(f))
+
+#endif /* _RIG_H */
+