diff --git a/aor/Makefile.am b/aor/Makefile.am
index 8e310727f..1ed2236af 100644
--- a/aor/Makefile.am
+++ b/aor/Makefile.am
@@ -1,9 +1,9 @@
-AORSRCLIST = ar8200.c
+AORSRCLIST = ar8200.c ar8000.c
 
 lib_LTLIBRARIES = libhamlib-aor.la
 libhamlib_aor_la_SOURCES = $(AORSRCLIST) aor.c
 libhamlib_aor_la_LDFLAGS = -no-undefined -module -avoid-version
-#libhamlib_aor_la_LIBADD = ../src/libhamlib.la
+libhamlib_aor_la_LIBADD = ../src/libhamlib.la
 
 lib_LIBRARIES = libhamlib-aor.a
 libhamlib_aor_a_SOURCES = $(AORSRCLIST) aor.c
diff --git a/aor/Makefile.in b/aor/Makefile.in
index 862f041e1..68a677c89 100644
--- a/aor/Makefile.in
+++ b/aor/Makefile.in
@@ -60,6 +60,9 @@ host_triplet = @host@
 AMTAR = @AMTAR@
 AS = @AS@
 AWK = @AWK@
+BACKENDEPS = @BACKENDEPS@
+BACKENDLNK = @BACKENDLNK@
+BACKEND_LIST = @BACKEND_LIST@
 CC = @CC@
 CPP = @CPP@
 CXX = @CXX@
@@ -90,13 +93,13 @@ am__quote = @am__quote@
 hamlibdocdir = @hamlibdocdir@
 install_sh = @install_sh@
 
-AORSRCLIST = ar8200.c
+AORSRCLIST = ar8200.c ar8000.c
 
 lib_LTLIBRARIES = libhamlib-aor.la
 libhamlib_aor_la_SOURCES = $(AORSRCLIST) aor.c
 libhamlib_aor_la_LDFLAGS = -no-undefined -module -avoid-version
+libhamlib_aor_la_LIBADD = ../src/libhamlib.la
 
-#libhamlib_aor_la_LIBADD = ../src/libhamlib.la
 lib_LIBRARIES = libhamlib-aor.a
 libhamlib_aor_a_SOURCES = $(AORSRCLIST) aor.c
 libhamlib_aor_a_LIBADD = ../src/libhamlib.la
@@ -110,12 +113,13 @@ LIBRARIES = $(lib_LIBRARIES)
 
 libhamlib_aor_a_AR = $(AR) cru
 libhamlib_aor_a_DEPENDENCIES = ../src/libhamlib.la
-am_libhamlib_aor_a_OBJECTS = ar8200.$(OBJEXT) aor.$(OBJEXT)
+am_libhamlib_aor_a_OBJECTS = ar8200.$(OBJEXT) ar8000.$(OBJEXT) \
+	aor.$(OBJEXT)
 libhamlib_aor_a_OBJECTS = $(am_libhamlib_aor_a_OBJECTS)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 
-libhamlib_aor_la_LIBADD =
-am_libhamlib_aor_la_OBJECTS = ar8200.lo aor.lo
+libhamlib_aor_la_DEPENDENCIES = ../src/libhamlib.la
+am_libhamlib_aor_la_OBJECTS = ar8200.lo ar8000.lo aor.lo
 libhamlib_aor_la_OBJECTS = $(am_libhamlib_aor_la_OBJECTS)
 
 DEFS = @DEFS@
@@ -125,6 +129,7 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/aor.Plo $(DEPDIR)/aor.Po \
+@AMDEP_TRUE@	$(DEPDIR)/ar8000.Plo $(DEPDIR)/ar8000.Po \
 @AMDEP_TRUE@	$(DEPDIR)/ar8200.Plo $(DEPDIR)/ar8200.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -222,6 +227,8 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/aor.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/aor.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ar8000.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ar8000.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ar8200.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ar8200.Po@am__quote@
 
diff --git a/aor/aor.c b/aor/aor.c
index a149c81b4..6cd521a57 100644
--- a/aor/aor.c
+++ b/aor/aor.c
@@ -2,7 +2,7 @@
  *  Hamlib AOR backend - main file
  *  Copyright (c) 2000,2001 by Stephane Fillod
  *
- *		$Id: aor.c,v 1.12 2001-07-13 19:08:15 f4cfe Exp $
+ *		$Id: aor.c,v 1.13 2001-10-22 20:23:42 f4cfe 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
@@ -315,6 +315,7 @@ int init_aor(void *be_handle)
 		rig_debug(RIG_DEBUG_VERBOSE, "aor: _init called\n");
 
 		rig_register(&ar8200_caps);
+		rig_register(&ar8000_caps);
 
 		return RIG_OK;
 }
diff --git a/aor/aor.h b/aor/aor.h
index c64215ce8..a27684db3 100644
--- a/aor/aor.h
+++ b/aor/aor.h
@@ -2,7 +2,7 @@
  *  Hamlib AOR backend - main header
  *  Copyright (c) 2000,2001 by Stephane Fillod
  *
- *		$Id: aor.h,v 1.6 2001-07-13 19:08:15 f4cfe Exp $
+ *		$Id: aor.h,v 1.7 2001-10-22 20:23:42 f4cfe 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
@@ -35,6 +35,7 @@ int aor_set_ts(RIG *rig, vfo_t vfo, shortfreq_t ts);
 int aor_set_powerstat(RIG *rig, powerstat_t status);
 
 extern const struct rig_caps ar8200_caps;
+extern const struct rig_caps ar8000_caps;
 
 extern HAMLIB_EXPORT(int) init_aor(void *be_handle);