diff --git a/ChangeLog b/ChangeLog
index bd470376..23a079ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep 30 16:35:54 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
+
+	* configure.in xml-config.in: patch from "Ben Taylor"
+	  <sol7x86@hotmail.com> for solaris shared libs lookup
+
 2000-09-30  Martin Baulig  <baulig@suse.de>
 
 	* libxml-2.0.pc.in: Provide pkg-config script.
diff --git a/configure.in b/configure.in
index b2a40c2b..914753ce 100644
--- a/configure.in
+++ b/configure.in
@@ -2,6 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.2)
 AC_INIT(entities.h)
 AM_CONFIG_HEADER(config.h)
+AC_CANONICAL_HOST
 
 LIBXML_MAJOR_VERSION=2
 LIBXML_MINOR_VERSION=2
@@ -134,6 +135,12 @@ if test "${GCC}" != "yes" ; then
 	       ;;
     esac
 fi
+case $host in
+*-*-solaris*)
+        XML_LIBDIR="${XML_LIBDIR} -R${libdir}"
+        ;;
+esac
+
 
 dnl
 dnl Use buffers for content
diff --git a/xml-config.in b/xml-config.in
index 1838c909..768e336d 100644
--- a/xml-config.in
+++ b/xml-config.in
@@ -3,6 +3,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 includedir=@includedir@
+libdir=@libdir@
 
 usage()
 {
@@ -57,7 +58,7 @@ while test $# -gt 0; do
        	;;
 
     --libs)
-       	echo -L@libdir@ @XML_LIBS@
+       	echo @XML_LIBDIR@ @XML_LIBS@ 
        	;;
 
     *)