diff --git a/ChangeLog b/ChangeLog
index d3d271c1a3..def2f793de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 19 16:02:22 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
+
+	* configure.in: don't build ld on solaris2 (not a viable option
+	  due to bugs in getpwnam & getpwuid)
+
 Tue Oct 19 15:13:56 1993  Ken Raeburn  (raeburn@rtl.cygnus.com)
 
 	* configure.in: Accept alpha-dec-osf1*, not just -osf1, since
diff --git a/configure.in b/configure.in
index 2d4a4abb35..e206884c3d 100644
--- a/configure.in
+++ b/configure.in
@@ -240,6 +240,9 @@ case "${target}" in
   sparc-*-sunos4*)
     use_gnu_ld=no
     ;;
+  sparc-*-solaris2*)
+    configdirs=`echo ${configdirs} | sed -e 's/ld//'`
+    ;;
   i[34]86-*-sco*)
     configdirs=`echo ${configdirs} | sed -e 's/gprof//'`
     ;;