diff --git a/archiver/ChangeLog b/archiver/ChangeLog
index 6587ee5d8..7cf3eb1f8 100644
--- a/archiver/ChangeLog
+++ b/archiver/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-11  Bradford Hovinen  <hovinen@ximian.com>
+
+	* Makefile.am (INCLUDES): Replace obsolete hcm directory names
+	with ximian-config
+
 2001-02-20  Bradford Hovinen  <hovinen@ximian.com>
 
 	* location.c (compare_xml_nodes): Use attr->val rather than
diff --git a/archiver/Makefile.am b/archiver/Makefile.am
index e619eb7bd..19a33a310 100644
--- a/archiver/Makefile.am
+++ b/archiver/Makefile.am
@@ -1,7 +1,7 @@
 confexecdir = $(libdir)
 confexec_DATA = ximian_archiverConf.sh
 
-Locationmetadir = $(datadir)/hcm/default
+Locationmetadir = $(datadir)/ximian-config/default
 Locationmeta_DATA = default-user.xml default-global.xml
 
 gladedir = $(prefix)/share/hcm/glade
@@ -14,8 +14,8 @@ INCLUDES = 			\
 	-I$(includedir) $(GNOME_INCLUDEDIR)		\
 	-DVERSION=\""$(VERSION)"\"			\
 	-DCONFIGDIR=\""/etc"\"				\
-	-DLOCATION_DIR=\""$(datadir)/hcm/default"\"	\
-	-DGLADE_DIR=\""$(datadir)/hcm/glade"\"		\
+	-DLOCATION_DIR=\""$(datadir)/ximian-config/default"\"	\
+	-DGLADE_DIR=\""$(datadir)/ximian-config/glade"\"		\
 	$(GNOME_XML_CFLAGS)				\
 	$(LIBGLADE_CFLAGS)
 
diff --git a/archiver/default-global.xml b/archiver/default-global.xml
index 5dcda3aa1..0f1043e3a 100644
--- a/archiver/default-global.xml
+++ b/archiver/default-global.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <location>
-  <contains>time-conf</contains>
-  <contains>shares-conf</contains>
+  <contains backend="boot-conf"/>
+  <contains backend="disks-conf"/>
+  <contains backend="memory-conf"/>
+  <contains backend="mouse-conf"/>
+  <contains backend="nameresolution-conf"/>
+  <contains backend="network-conf"/>
+  <contains backend="print-conf"/>
+  <contains backend="shares-conf"/>
+  <contains backend="time-conf"/>
+  <contains backend="users-conf"/>
 </location>