diff --git a/mingw-w64-crt/ChangeLog b/mingw-w64-crt/ChangeLog
index 9e854ee..65e5553 100644
--- a/mingw-w64-crt/ChangeLog
+++ b/mingw-w64-crt/ChangeLog
@@ -1,5 +1,12 @@
 2010-07-20  Ozkan Sezer  <sezeroz@gmail.com>
 
+	* include/sect_attribs.h: Moved the _MSC_VER ifdef up to cover the
+	_ATTRIBUTES macro which is only for the M$ section pragmas. Changed
+	the __x86_64__ and __ia64__ ifdefs to _M_IA64 and _M_AMD64, because
+	it serves only the M$ compiler.
+
+2010-07-20  Ozkan Sezer  <sezeroz@gmail.com>
+
 	* crt/tlssup.c: Include stdlib.h in win32 builds to for _winmajor.
 	Before we started defining WIN32_LEAN_AND_MEAN, it was getting it by
 	sheer dumb luck.
diff --git a/mingw-w64-crt/include/sect_attribs.h b/mingw-w64-crt/include/sect_attribs.h
index ff58c06..6e59216 100644
--- a/mingw-w64-crt/include/sect_attribs.h
+++ b/mingw-w64-crt/include/sect_attribs.h
@@ -4,13 +4,14 @@
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
-#if defined (__ia64__) || defined (__x86_64)
+#if defined(_MSC_VER)
+
+#if defined(_M_IA64) || defined(_M_AMD64)
 #define _ATTRIBUTES
 #else
 #define _ATTRIBUTES shared
 #endif
 
-#if defined(_MSC_VER)
 /* Reference list of existing section for msvcrt.  */
 #pragma section(".CRTMP$XCA",long,_ATTRIBUTES)
 #pragma section(".CRTMP$XCZ",long,_ATTRIBUTES)
@@ -59,7 +60,7 @@
 #pragma section(".tls",long,read,write)
 #pragma section(".tls$AAA",long,read,write)
 #pragma section(".tls$ZZZ",long,read,write)
-#endif
+#endif /* _MSC_VER */
 
 #if defined(_MSC_VER)
 #define _CRTALLOC(x) __declspec(allocate(x))
@@ -68,3 +69,4 @@
 #else
 #error Your compiler is not supported.
 #endif
+