diff --git a/ChangeLog b/ChangeLog
index 9870fa3746..7c062068d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Jan 14 12:48:07 1998  Keith Seitz  <keiths@pizza.cygnus.com>
+
+	* configure.in: Make sure we only replace RPATH_ENVVAR on
+	lines which begin with RPATH_ENVVAR, i.e. add "^" to the
+	regexp to sed.
+
+	* Makefile.in (BASE_FLAGS_TO_PASS): Pass RRPATH_ENVVAR down
+	to sub-makes.
+
 1998-01-13  Lee Iverson   (leei@ai.sri.com)
 
 	* config-ml.in (multi-do): LDFLAGS must include multilib
diff --git a/configure.in b/configure.in
index d7e894b4ec..db2b6041d4 100644
--- a/configure.in
+++ b/configure.in
@@ -1021,7 +1021,7 @@ if [ "${shared}" = "yes" ]; then
 
   case "${host}" in
   *-*-hpux*)
-    sed -e 's/RPATH_ENVVAR[ 	]*=.*$/RPATH_ENVVAR = SHLIB_PATH/' \
+    sed -e 's/^RPATH_ENVVAR[ 	]*=.*$/RPATH_ENVVAR = SHLIB_PATH/' \
 	Makefile > Makefile.tem
     rm -f Makefile
     mv -f Makefile.tem Makefile