diff --git a/Makefile.am b/Makefile.am
index 2c887df79..2e52831a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ SUBDIRS = macros include lib libltdl src @BACKEND_LIST@ @ROT_BACKEND_LIST@ \
 DIST_SUBDIRS = macros include lib libltdl src c++ bindings tests doc \
 	icom kenwood aor yaesu dummy pcr alinco uniden tentec kachina jrc \
 	rpcrig winradio easycomm fodtrack rpcrot gnuradio drake rotorez \
-	microtune flexradio sartek lowe rft tapr kit skanti
+	microtune flexradio sartek lowe rft tapr kit skanti wj racal tuner
 
 rpm: Makefile
 	make dist
diff --git a/configure.ac b/configure.ac
index f5d18d2ca..698ac29ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -202,7 +202,7 @@ fi
 AC_SUBST(RIGMATRIX)
 
 
-BACKEND_LIST="icom kenwood aor yaesu dummy pcr alinco uniden tentec kachina jrc drake lowe rft kit skanti tapr flexradio"
+BACKEND_LIST="icom kenwood aor yaesu dummy pcr alinco uniden tentec kachina jrc drake lowe rft kit skanti tapr flexradio wj racal tuner"
 ROT_BACKEND_LIST="dummy easycomm rotorez sartek fodtrack"
 BINDINGS=""
 BINDING_LIST=""
@@ -411,6 +411,9 @@ rft/Makefile
 kit/Makefile
 tapr/Makefile
 skanti/Makefile
+wj/Makefile
+racal/Makefile
+tuner/Makefile
 gnuradio/Makefile
 easycomm/Makefile
 fodtrack/Makefile
diff --git a/include/hamlib/riglist.h b/include/hamlib/riglist.h
index 17cd3df9c..f67d8b766 100644
--- a/include/hamlib/riglist.h
+++ b/include/hamlib/riglist.h
@@ -2,7 +2,7 @@
  *  Hamlib Interface - list of known rigs
  *  Copyright (c) 2000-2004 by Stephane Fillod and Frank Singleton
  *
- *	$Id: riglist.h,v 1.46 2004-08-11 17:58:36 fillods Exp $
+ *	$Id: riglist.h,v 1.47 2004-09-12 21:27:16 fillods 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
@@ -285,6 +285,7 @@
 #define RIG_MODEL_HF1000 RIG_MAKE_MODEL(RIG_WJ, 1)
 #define RIG_MODEL_HF1000A RIG_MAKE_MODEL(RIG_WJ, 2)
 #define RIG_MODEL_WJ8711 RIG_MAKE_MODEL(RIG_WJ, 3)
+#define RIG_MODEL_WJ8888 RIG_MAKE_MODEL(RIG_WJ, 4)
 
 	/*
 	 * Rohde & Schwarz
@@ -409,6 +410,14 @@
 #define RIG_MODEL_ELEKTOR304 RIG_MAKE_MODEL(RIG_KIT, 1)
 #define RIG_MODEL_DRT1 RIG_MAKE_MODEL(RIG_KIT, 2)
 
+	/*
+	 * SW/FM/TV tuner cards supported by Video4Linux,*BSD, ..
+	 */
+#define RIG_TUNER 26
+#define RIG_BACKEND_TUNER "tuner"
+#define RIG_MODEL_V4L RIG_MAKE_MODEL(RIG_TUNER, 1)
+
+
 
 	/*
 	 * TODO:
@@ -457,6 +466,7 @@ typedef int rig_model_t;
 		{ RIG_FLEXRADIO, RIG_BACKEND_FLEXRADIO }, \
 		{ RIG_RFT, RIG_BACKEND_RFT }, \
 		{ RIG_KIT, RIG_BACKEND_KIT }, \
+		{ RIG_TUNER, RIG_BACKEND_TUNER }, \
 		{ 0, NULL }, /* end */  \
 }