diff --git a/ChangeLog b/ChangeLog
index 160694db7c..4a772bb4a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 26 15:40:14 1996  Brendan Kehoe  <brendan@zen.org>
+
+	* sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h (NO_UNDERSCORES): Use
+	wrapped with #ifndef, to avoid config.h defining it.
+
 Mon Mar 25 13:10:04 1996  Roland McGrath  <roland@charlie-brown.gnu.ai.mit.edu>
 
 	* malloc/realloc.c (_realloc_internal): In case of growing large
diff --git a/sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h b/sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h
index edb98309e6..49eac9a3eb 100644
--- a/sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h
+++ b/sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h
@@ -17,7 +17,9 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
 /* Solaris 2 does not precede the asm names of C symbols with a `_'. */
+#ifndef NO_UNDERSCORES
 #define	NO_UNDERSCORES
+#endif
 
 #include <sysdeps/unix/sysdep.h>