diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index ceae90da0..cf19ace24 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-02  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* basetyps.h (GUID_SECT): Define to nothimg for GCC >= 2.95.
+
 2004-03-02  Martin Fuchs  <martin-fuchs@gmx.net>
 
 	* include/oleauto.h (VAR_VALIDDATE, VAR_FORMAT_NOSUBSTITUTE,
diff --git a/winsup/w32api/include/basetyps.h b/winsup/w32api/include/basetyps.h
index d8cb3c72c..aad89c953 100644
--- a/winsup/w32api/include/basetyps.h
+++ b/winsup/w32api/include/basetyps.h
@@ -146,7 +146,10 @@ typedef unsigned long PROPID;
 #ifndef GUID_SECTION
 #define GUID_SECTION ".text"
 #endif
-#ifdef __GNUC__
+/* Explicit naming of .text section for readonly data is only
+   needed for older GGC (pre-2.95).
+   More recent (3.4) GCC puts readonly data in .rdata.  */
+#if defined (__GNUC__) && (__GNUC__ <= 2 && __GNUC_MINOR__ < 95) 
 #define GUID_SECT __attribute__ ((section (GUID_SECTION)))
 #else
 #define GUID_SECT