diff --git a/glm-0.9.7.2-setup-detect-GCC-6.0.patch b/glm-0.9.7.2-setup-detect-GCC-6.0.patch
new file mode 100644
index 0000000..7b448be
--- /dev/null
+++ b/glm-0.9.7.2-setup-detect-GCC-6.0.patch
@@ -0,0 +1,48 @@
+From f0acbbd4aca300a5e7942977fe0ace996d849b89 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Joonas=20Saraj=C3=A4rvi?= <muep@iki.fi>
+Date: Thu, 4 Feb 2016 19:42:25 +0200
+Subject: [PATCH] setup: detect GCC 6.0
+
+---
+ glm/detail/setup.hpp             | 3 +++
+ test/core/core_setup_message.cpp | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp
+index e455a43..f3c8609 100644
+--- a/glm/detail/setup.hpp
++++ b/glm/detail/setup.hpp
+@@ -151,6 +151,7 @@
+ #define GLM_COMPILER_GCC51			0x02000300
+ #define GLM_COMPILER_GCC52			0x02000400
+ #define GLM_COMPILER_GCC53			0x02000500
++#define GLM_COMPILER_GCC60			0x02000600
+ 
+ // CUDA
+ #define GLM_COMPILER_CUDA			0x10000000
+@@ -312,6 +313,8 @@
+ #		define GLM_COMPILER (GLM_COMPILER_GCC52)
+ #	elif (__GNUC__ == 5) && (__GNUC_MINOR__ >= 3)
+ #		define GLM_COMPILER (GLM_COMPILER_GCC53)
++#	elif (__GNUC__ == 6) && (__GNUC_MINOR__ >= 0)
++#		define GLM_COMPILER (GLM_COMPILER_GCC60)
+ #	else
+ #		define GLM_COMPILER (GLM_COMPILER_GCC)
+ #	endif
+diff --git a/test/core/core_setup_message.cpp b/test/core/core_setup_message.cpp
+index 6c9a376..3808dec 100644
+--- a/test/core/core_setup_message.cpp
++++ b/test/core/core_setup_message.cpp
+@@ -71,6 +71,9 @@ int test_compiler()
+ 		case GLM_COMPILER_GCC53:
+ 			std::printf("GLM_COMPILER_GCC53\n");
+ 			break;
++		case GLM_COMPILER_GCC60:
++			std::printf("GLM_COMPILER_GCC60\n");
++			break;
+ 		default:
+ 			std::printf("GCC version not detected\n");
+ 			Error += 1;
+-- 
+2.7.0
+
diff --git a/glm.spec b/glm.spec
index e6f7c9d..b7117b6 100644
--- a/glm.spec
+++ b/glm.spec
@@ -3,13 +3,14 @@
 
 Name:           glm
 Version:        0.9.7.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C++ mathematics library for graphics programming
 
 License:        MIT
 URL:            http://glm.g-truc.net/
 Source0:        https://github.com/g-truc/glm/releases/download/%{version}/%{name}-%{version}.zip
 Patch0:         glm-0.9.6.1-ulp.patch
+Patch1:         glm-0.9.7.2-setup-detect-GCC-6.0.patch
 
 BuildRequires:  cmake
 
@@ -75,8 +76,15 @@ sed -i 's/\r//' doc/api/dynsections.js
 sed -i 's/\r//' doc/api/jquery.js
 sed -i 's/\r//' doc/api/tabs.css
 
+# These are just for being able to apply the patch that
+# was exported from git.
+sed -i 's/\r//' glm/detail/setup.hpp
+sed -i 's/\r//' test/core/core_setup_message.cpp
+
+
 
 %patch0 -p1 -b .ulp
+%patch1 -p1 -b .setup-gcc6
 
 %build
 mkdir build
@@ -117,6 +125,9 @@ mv $RPM_BUILD_ROOT%{_libdir}/cmake $RPM_BUILD_ROOT%{_datadir}/cmake
 %doc doc/api/
 
 %changelog
+* Thu Feb 04 2016 Joonas Sarajärvi <muep@iki.fi> - 0.9.7.2-3
+- Fix tests with GCC 6.0
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.7.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild