diff --git a/configure.ac b/configure.ac
index eabd6a7be..82a6f976e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,8 +51,7 @@ dnl added to AC_CONFIG_FILES near the end of this file.  See README.developer
 dnl Beware of duplication should a backend directory include both rig and
 dnl rotor definitions, e.g. "dummy".  Optional backends will not be listed
 dnl here but will be added later, e.g. "winradio".
-BACKEND_LIST="dummy"
-RIG_BACKEND_LIST="rigs/adat rigs/alinco rigs/aor rigs/barrett rigs/dorji rigs/drake rigs/elad rigs/flexradio rigs/icom rigs/icmarine rigs/jrc rigs/kachina rigs/kenwood rigs/kit rigs/lowe rigs/pcr rigs/prm80 rigs/racal rigs/rft rigs/rs rigs/skanti rigs/tapr rigs/tentec rigs/tuner rigs/uniden rigs/winradio rigs/wj rigs/yaesu"
+RIG_BACKEND_LIST="rigs/adat rigs/alinco rigs/aor rigs/barrett rigs/dorji rigs/drake rigs/dummy rigs/elad rigs/flexradio rigs/icom rigs/icmarine rigs/jrc rigs/kachina rigs/kenwood rigs/kit rigs/lowe rigs/pcr rigs/prm80 rigs/racal rigs/rft rigs/rs rigs/skanti rigs/tapr rigs/tentec rigs/tuner rigs/uniden rigs/winradio rigs/wj rigs/yaesu"
 ROT_BACKEND_LIST="rotators/amsat rotators/ars rotators/celestron rotators/cnctrk rotators/easycomm rotators/ether6 rotators/fodtrack rotators/gs232a rotators/heathkit rotators/m2 rotators/meade rotators/rotorez rotators/sartek rotators/spid rotators/ts7400 rotators/prosistel rotators/ioptron"
 # Amplifiers are all in the amplifiers directory
 AMP_BACKEND_LIST="amplifiers/elecraft"
@@ -723,17 +722,6 @@ echo Build_OS is $build_os
 
 dnl otherwise parallel 'make -jn' will fail
 
-## ---------------------------------- ##
-## Prepare toplevel backend dependencies ##
-## ---------------------------------- ##
-
-for be in ${BACKEND_LIST} ; do
-        BACKENDEPS="${BACKENDEPS} \$(top_builddir)/${be}/libhamlib-${be}.la"
-done
-
-AC_SUBST([BACKEND_LIST])
-AC_SUBST([BACKENDEPS])
-
 ## ---------------------------------- ##
 ## Prepare rig backend dependencies ##
 ## ---------------------------------- ##
@@ -791,7 +779,6 @@ AC_CONFIG_FILES([Makefile
 macros/Makefile
 include/Makefile
 lib/Makefile
-dummy/Makefile
 src/Makefile
 c++/Makefile
 bindings/Makefile
@@ -820,6 +807,7 @@ rigs/aor/Makefile
 rigs/barrett/Makefile
 rigs/dorji/Makefile
 rigs/drake/Makefile
+rigs/dummy/Makefile
 rigs/elad/Makefile
 rigs/flexradio/Makefile
 rigs/icmarine/Makefile
diff --git a/dummy/Android.mk b/rigs/dummy/Android.mk
similarity index 100%
rename from dummy/Android.mk
rename to rigs/dummy/Android.mk
diff --git a/dummy/Makefile.am b/rigs/dummy/Makefile.am
similarity index 100%
rename from dummy/Makefile.am
rename to rigs/dummy/Makefile.am
diff --git a/dummy/amp_dummy.c b/rigs/dummy/amp_dummy.c
similarity index 100%
rename from dummy/amp_dummy.c
rename to rigs/dummy/amp_dummy.c
diff --git a/dummy/amp_dummy.h b/rigs/dummy/amp_dummy.h
similarity index 100%
rename from dummy/amp_dummy.h
rename to rigs/dummy/amp_dummy.h
diff --git a/dummy/dummy.c b/rigs/dummy/dummy.c
similarity index 100%
rename from dummy/dummy.c
rename to rigs/dummy/dummy.c
diff --git a/dummy/dummy.h b/rigs/dummy/dummy.h
similarity index 100%
rename from dummy/dummy.h
rename to rigs/dummy/dummy.h
diff --git a/dummy/flrig.README b/rigs/dummy/flrig.README
similarity index 100%
rename from dummy/flrig.README
rename to rigs/dummy/flrig.README
diff --git a/dummy/flrig.c b/rigs/dummy/flrig.c
similarity index 100%
rename from dummy/flrig.c
rename to rigs/dummy/flrig.c
diff --git a/dummy/flrig.h b/rigs/dummy/flrig.h
similarity index 100%
rename from dummy/flrig.h
rename to rigs/dummy/flrig.h
diff --git a/dummy/netampctl.c b/rigs/dummy/netampctl.c
similarity index 100%
rename from dummy/netampctl.c
rename to rigs/dummy/netampctl.c
diff --git a/dummy/netrigctl.c b/rigs/dummy/netrigctl.c
similarity index 100%
rename from dummy/netrigctl.c
rename to rigs/dummy/netrigctl.c
diff --git a/dummy/netrotctl.c b/rigs/dummy/netrotctl.c
similarity index 100%
rename from dummy/netrotctl.c
rename to rigs/dummy/netrotctl.c
diff --git a/dummy/rot_dummy.c b/rigs/dummy/rot_dummy.c
similarity index 100%
rename from dummy/rot_dummy.c
rename to rigs/dummy/rot_dummy.c
diff --git a/dummy/rot_dummy.h b/rigs/dummy/rot_dummy.h
similarity index 100%
rename from dummy/rot_dummy.h
rename to rigs/dummy/rot_dummy.h
diff --git a/dummy/trxmanager.c b/rigs/dummy/trxmanager.c
similarity index 100%
rename from dummy/trxmanager.c
rename to rigs/dummy/trxmanager.c
diff --git a/dummy/trxmanager.h b/rigs/dummy/trxmanager.h
similarity index 100%
rename from dummy/trxmanager.h
rename to rigs/dummy/trxmanager.h
diff --git a/tests/rigctl.c b/tests/rigctl.c
index 2c9d7800f..5c482ab74 100644
--- a/tests/rigctl.c
+++ b/tests/rigctl.c
@@ -72,7 +72,6 @@ extern int read_history();
 #include "iofunc.h"
 #include "serial.h"
 #include "sprintflst.h"
-#include "dummy/dummy.h"
 #include "rigctl_parse.h"
 
 #define MAXNAMSIZ 32