diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 21b729f77..e8406b55c 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-31  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/_mingw.h (__MINGW_ATTRIB_NONNULL): Define.
+
 2005-03-24  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	* include/stdio.h (__mingw_fwrite): Change return value to
diff --git a/winsup/mingw/include/_mingw.h b/winsup/mingw/include/_mingw.h
index 46c1ce7b9..c30b5eaed 100644
--- a/winsup/mingw/include/_mingw.h
+++ b/winsup/mingw/include/_mingw.h
@@ -136,6 +136,13 @@
 #define __MINGW_ATTRIB_PURE
 #endif
 
+/* Attribute `nonnull' was valid as of gcc 3.3.  */
+#if (__GNUC__ > 3 ||( __GNUC__ == 3 &&  __GNUC_MINOR >= 3))
+#define __MINGW_ATTRIB_NONNULL(args...) __attribute__ ((__nonnull__ (args)))
+#else
+#define __MINGW_ATTRIB_NONNULL(args...)
+#endif /* GNUC >= 3.3 */
+
 #ifndef __MSVCRT_VERSION__
 /*  High byte is the major version, low byte is the minor. */
 # define __MSVCRT_VERSION__ 0x0600