diff --git a/ChangeLog b/ChangeLog
index dd87eea8..6281da7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-21  Sam Thursfield  <ssssam@gmail.com>  (tiny change)
+
+	Avoid leading separator in PATH for DLL search.
+	* libltdl/config/ltmain.m4sh (func_mode_link) [cygwin, mingw]
+	[ pw32, os2, cegcc]: Fix dllsearchpath not to contain leading
+	separator.
+	* THANKS: Update.
+
 2008-08-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* libltdl/config/ltmain.m4sh (func_mode_link): Quote $#.
diff --git a/THANKS b/THANKS
index f284d4e2..1e48a00d 100644
--- a/THANKS
+++ b/THANKS
@@ -124,6 +124,7 @@
   Robert Ögren			lists@roboros.com
   Roberto Bagnara		bagnara@cs.unipr.it
   Roland Mainz			roland.mainz@nrubsig.org
+  Sam Thursfield		ssssam@gmail.com
   Sebastian Wilhelmi		wilhelmi@ira.uka.de
   Simon Josefsson		jas@extundo.com
   Stephan Kulow			coolo@kde.org
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 590252eb..7e319c99 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -4064,10 +4064,12 @@ func_mode_link ()
 	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$dir:"*) ;;
+	  ::) dllsearchpath=$dir;;
 	  *) dllsearchpath="$dllsearchpath:$dir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
 	  *) dllsearchpath="$dllsearchpath:$testbindir";;
 	  esac
 	  ;;
@@ -7160,10 +7162,12 @@ EOF
 	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$libdir:"*) ;;
+	  ::) dllsearchpath=$libdir;;
 	  *) dllsearchpath="$dllsearchpath:$libdir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
 	  *) dllsearchpath="$dllsearchpath:$testbindir";;
 	  esac
 	  ;;