diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 5c74d22c6..01793dfee 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-06  Danny Smith  <dannysmith@users.sourceforge
+
+	* include/_mingw.h (__MINGW_ATTRIBUTE_NONNULL): Fix typo
+	in GNUC version guard.
+
 2005-05-20  Danny Smith  <dannysmith@users.sourceforge
 
 	* crt1.c (_gnu_exception_handler): Handle illegal instruction
@@ -7,7 +12,7 @@
 
 	* mingwex/math/nexttoward.c: New file.
 	* mingwex/math/nexttowardf.c: New file.
-	* mingwex/math/nextafterl.c: Add nexttowardl aliaa.
+	* mingwex/math/nextafterl.c: Add nexttowardl alias.
 	* mingwex/Makefile.in (MATH_DISTFILES): Add nexttoward.c,
 	mexttowardf.c,
 	(MATH_OBJS):  Add nexttoward.o,	mexttowardf.o,
diff --git a/winsup/mingw/include/_mingw.h b/winsup/mingw/include/_mingw.h
index 32356f30b..4b3b42d6c 100644
--- a/winsup/mingw/include/_mingw.h
+++ b/winsup/mingw/include/_mingw.h
@@ -137,9 +137,9 @@
 #endif
 
 /* Attribute `nonnull' was valid as of gcc 3.3.  We don't use GCC's
-   variadiac macro facility, because variadic macros causes syntax
+   variadiac macro facility, because variadic macros cause syntax
    errors with  --traditional-cpp.  */
-#if (__GNUC__ > 3 ||( __GNUC__ == 3 &&  __GNUC_MINOR >= 3))
+#if (__GNUC__ > 3 ||( __GNUC__ == 3 &&  __GNUC_MINOR__ >= 3))
 #define __MINGW_ATTRIB_NONNULL(arg) __attribute__ ((__nonnull__ (arg)))
 #else
 #define __MINGW_ATTRIB_NONNULL(arg)