diff --git a/doc/contributions.txt b/doc/contributions.txt
index 6b51e2649ebe0edf9bde6eb736c6b734b712f1fb..942ba0f0b9727b55fd8a2b8ac60ee8ff3dd5c8e0 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -497,6 +497,7 @@ Ringo Tuxing
 	CT-231
 	CT-321
 Robin Cornelius
+	SNOW-204
 	VWR-2488
 	VWR-9557
 	VWR-11128
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index b168c0855219ab970b60ba50ed2e2de749d402a8..173e650961d179e6066d346e1bfe07da6df08a37 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -118,14 +118,15 @@ if (LINUX)
     endif (NOT ${GXX_VERSION} MATCHES " 4.1.*Red Hat")
   endif (${GXX_VERSION} STREQUAL ${CXX_VERSION})
 
-  # GCC 4.3 introduces a pile of obnoxious new warnings, which we
-  # treat as errors due to -Werror.  Quiet the most offensive and
-  # widespread of them.
+  # Let's actually get a numerical version of gxx's version
+  STRING(REGEX REPLACE ".* ([0-9])\\.([0-9])\\.([0-9]).*" "\\1\\2\\3" CXX_VERSION ${CXX_VERSION})
 
-  if (${CXX_VERSION} MATCHES "4.3")
+  # gcc 4.3 and above don't like the LL boost and also 
+  # cause warnings due to our use of deprecated headers
+  if(${CXX_VERSION} GREATER 429)
     add_definitions(-Wno-parentheses)
     set(CMAKE_CXX_FLAGS "-Wno-deprecated ${CMAKE_CXX_FLAGS}")
-  endif (${CXX_VERSION} MATCHES "4.3")
+  endif (${CXX_VERSION} GREATER 429)
 
   # End of hacks.