diff --git a/ChangeLog b/ChangeLog
index 68c6472eac..df5d90c724 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-29  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/ia64/bits/siginfo.h (si_segvflags):
+	Renamed from si+flags due to comflict with si_flags from <elf.h>.
+
 2004-09-28  Ulrich Drepper  <drepper@redhat.com>
 
 	* nscd/nscd_getai.c: Use NO_MAPPING instead of MAP_FAILED for test
diff --git a/sysdeps/unix/sysv/linux/ia64/bits/siginfo.h b/sysdeps/unix/sysv/linux/ia64/bits/siginfo.h
index 52d00e9da9..66310c65b3 100644
--- a/sysdeps/unix/sysv/linux/ia64/bits/siginfo.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/siginfo.h
@@ -122,11 +122,11 @@ typedef struct siginfo
 # define si_band	_sifields._sigpoll.si_band
 # define si_fd		_sifields._sigpoll.si_fd
 
-#ifdef __USE_GNU
+# ifdef __USE_GNU
 #  define si_imm	_sifields._sigfault._si_imm
-#  define si_flags	_sifields._sigfault._si_flags
+#  define si_segvflags	_sifields._sigfault._si_flags
 #  define si_isr	_sifields._sigfault._si_isr
-#endif
+# endif
 
 /* Values for `si_code'.  Positive values are reserved for kernel-generated
    signals.  */