diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab19a601..b9865696 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,6 +53,12 @@ if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_CXX_COMPILER_ID}"
 		set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++98")
 		set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
 		set(CMAKE_CXX_FLAGS "-std=c++98")
+		if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU"))
+			# GLM is using GCC 64 bits integer extension
+			add_definitions(-Wno-long-long)
+		elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+			add_definitions(-Wno-c++11-long-long)
+		endif()
 	endif()
 endif()
 
diff --git a/readme.md b/readme.md
index 93c5630e..c1a417a9 100644
--- a/readme.md
+++ b/readme.md
@@ -58,6 +58,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
 ##### Fixes:
 - Fixed STL for C++11 detection on ICC #510
 - Fixed missing vec1 overload to length2 and distance2 functions #431
+- Fixed long long warnings when using C++98 on GCC and Clang #482
 
 #### [GLM 0.9.7.5](https://github.com/g-truc/glm/releases/tag/0.9.7.5) - 2016-05-24
 ##### Improvements:
@@ -69,6 +70,8 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
 - Fixed Visual C++ SIMD instruction set automatic detection in 64 bits
 - Fixed to_string when used with GLM_FORCE_INLINE #506
 - Fixed GLM_FORCE_INLINE with binary vec4 operators
+- Fixed GTX_extended_min_max filename typo #386
+- Fixed intersectRayTriangle to not do any unintentional backface culling
 
 #### [GLM 0.9.7.4](https://github.com/g-truc/glm/releases/tag/0.9.7.4) - 2016-03-19
 ##### Fixes: