diff --git a/archiver/ChangeLog b/archiver/ChangeLog
index 08fa29db5..c8884b6bc 100644
--- a/archiver/ChangeLog
+++ b/archiver/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-26  Chema Celorio  <chema@celorio.com>
+
+	* Makefile.am (ximian_archiverConf.sh): create x_aConf.sh from
+	the XIMIAN_ARCHIVER_FOO_CONF varialbes
+
 2001-05-24  Arturo Espinosa Aldama  <arturo@ximian.com>
 
 	* 0.5 RELEASE
diff --git a/archiver/Makefile.am b/archiver/Makefile.am
index 2dae126fb..b4533fa39 100644
--- a/archiver/Makefile.am
+++ b/archiver/Makefile.am
@@ -65,9 +65,9 @@ EXTRA_DIST = \
 #
 ximian_archiverConf.sh: ximian_archiverConf.sh.in Makefile
 	sed -e 's?\@VERSION\@?$(VERSION)?' \
-	    -e 's?\@XIMIAN_ARCHIVER_LIBDIR\@?$(XIMIAN_ARCHIVER_LIBDIR)?g' \
-	    -e 's?\@XIMIAN_ARCHIVER_LIBS\@?$(XIMIAN_ARCHIVER_LIBS)?g' \
-	    -e 's?\@XIMIAN_ARCHIVER_INCLUDEDIR\@?$(XIMIAN_ARCHIVER_INCLUDEDIR)?g' \
+	    -e 's?\@XIMIAN_ARCHIVER_LIBDIR\@?$(XIMIAN_ARCHIVER_LIBDIR_CONF)?g' \
+	    -e 's?\@XIMIAN_ARCHIVER_LIBS\@?$(XIMIAN_ARCHIVER_LIBS_CONF)?g' \
+	    -e 's?\@XIMIAN_ARCHIVER_INCLUDEDIR\@?$(XIMIAN_ARCHIVER_INCLUDEDIR_CONF)?g' \
 	    < $(srcdir)/ximian_archiverConf.sh.in > ximian_archiverConf.tmp \
 	  && mv ximian_archiverConf.tmp ximian_archiverConf.sh