diff --git a/ChangeLog b/ChangeLog
index 3b4da0153..3e170d0b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jul  2 12:28:40 1997  Tim Pierce  <twp@twp.tezcat.com>
+
+	* ltmain.sh: Remove any trailing colon on $shlibpath_var
+	(i.e. LD_LIBRARY_PATH) for braindamaged linkers that choke on it.
+	Patch sent to bug-libtool.
+
 Sat Jun 28 16:13:43 1997  Tim Pierce  <twp@twp.tezcat.com>
 
 	* configure.in: Add alloca.o explicitly to LIBOBJS (thanks Eric
diff --git a/ltmain.sh b/ltmain.sh
index 95e72ff37..1f95192d8 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1008,6 +1008,9 @@ EOF
 
     # Add our own library path to $shlibpath_var
     $shlibpath_var="$temp_rpath\$$shlibpath_var"
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    $shlibpath_var=\`echo \$$shlibpath_var | sed -e 's/:\$//'\`
+
     export $shlibpath_var
 EOF
 	fi
@@ -1188,7 +1191,7 @@ EOF
 
       # Not a directory, so check to see that there is only one file specified.
       set dummy $files
-      if test $# -gt 2; then
+      if $# -gt 2; then
         echo "$progname: \`$dest' is not a directory" 1>&2
         echo "$help" 1>&2
 	exit 1