diff --git a/ChangeLog b/ChangeLog
index 98e5a0f4..833da692 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 1999-01-20  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+	* ltconfig.in (linux*, solaris*, bsdi4*, sys_lib_search_path):
+	remove expansion of $LD_LIBRARY_PATH
+	* ltmain.in (lib_search_path): append the expansion of $shlibpath_var
+	* doc/libtool.texi: document it
+
 	* THANKS: Added Steven Schultz
 
 1999-01-20  Steven M. Schultz <sms@wlv.iipo.gtegsc.com>
diff --git a/doc/libtool.texi b/doc/libtool.texi
index 4be02953..7ecde30f 100644
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -3547,7 +3547,9 @@ the file.
 @end defvar
 
 @defvar sys_lib_search_path_spec
-Expression to get the system library search path.
+Expression to get the system library search path.  The directories
+listed in @var{shlibpath_var} are automatically appended to this list,
+every time libtool runs (i.e., not at configuration time).
 @end defvar
 
 @defvar version_type
diff --git a/ltconfig.in b/ltconfig.in
index 99c8299d..8cf12869 100755
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1651,7 +1651,7 @@ bsdi4*)
   finish_cmds='PATH="$PATH:/sbin" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   check_shared_deplibs_method='file_magic ELF 32-bit LSB shared object'
-  sys_lib_search_path="/shlib /usr/lib /usr/local/lib `echo $LD_LIBRARY_PATH | sed -e 's/:/ /g'`"
+  sys_lib_search_path="/shlib /usr/lib /usr/local/lib"
   ;;
 
 cygwin32* | mingw32*)
@@ -1735,7 +1735,6 @@ linux-gnu*)
   shlibpath_var=LD_LIBRARY_PATH
   deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
   file_magic_command=file
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib `echo $LD_LIBRARY_PATH | sed -e 's/:/ /g'`"
 
   if test -f /lib/ld.so.1; then
     dynamic_linker='GNU ld.so'
@@ -1803,7 +1802,6 @@ solaris*)
   postinstall_cmds='chmod +x $lib'
   deplibs_check_method="file_magic ELF [0-9][0-9]-bit [LM]SB dynamic lib"
   file_magic_command="file"
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib `echo $LD_LIBRARY_PATH | sed -e 's/:/ /g'`"
   ;;
 
 sunos4*)
diff --git a/ltmain.in b/ltmain.in
index 3dc2c57a..66a8d77e 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -655,7 +655,15 @@ compiler."
     convenience=
     old_convenience=
     deplibs=
-    eval lib_search_path=\"$sys_lib_search_path_spec\"
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval lib_search_path=\`\$echo \"X \${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+    else
+      libsearch_path=
+    fi
+    # now prepend the system-specific ones
+    eval lib_search_path=\"$sys_lib_search_path_spec\$lib_search_path\"
     
     avoid_version=no
     dlfiles=