diff --git a/ChangeLog b/ChangeLog
index 05481e35..3dca152c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-12-20  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
+	* m4/libtool.m4 [solaris] (_LT_LINKER_SHLIBS): Change no_undefined_flag
+	back to ' -z defs'.  Problems with linking against libgcc.a will have
+	to be resolved differently.
+
 	* tests/demo-nopic.test [solaris, sunos]: Skip test.
 
 2004-12-18  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 5f4eea6f..9224d8ec 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -4156,7 +4156,7 @@ _LT_EOF
       ;;
 
     solaris*)
-      _LT_TAGVAR(no_undefined_flag, $1)=' -z text'
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
       if test "$GCC" = yes; then
 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$ECHO "local: *; };" >> $lib.exp~