diff --git a/ChangeLog b/ChangeLog
index 1ac10fa18..4b56d5aaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* configure.in: Make G_GNUC_INTERNAL a no-op for
+	gcc 2.95.    (#329031, David Schleef, Marc Brockschmidt)
+
 2007-01-12  Matthias Clasen  <mclasen@redhat.com>
 
 	* gthread/gthread-posix.c:
diff --git a/configure.in b/configure.in
index f0f306417..9086b6eb5 100644
--- a/configure.in
+++ b/configure.in
@@ -2445,8 +2445,12 @@ _______EOF
 
 	if test x$g_have_gnuc_visibility = xyes ; then
 		cat >>$outfile <<_______EOF
+#if __GNUC__ == 2 && __GNUC_MINOR__ == 95
+#define G_GNUC_INTERNAL
+#else
 #define G_HAVE_GNUC_VISIBILITY 1
 #define G_GNUC_INTERNAL __attribute__((visibility("hidden")))
+#fi
 _______EOF
 	else
 		cat >>$outfile <<_______EOF