diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp
index c6fcd32f..f0c9cc7a 100644
--- a/glm/core/setup.hpp
+++ b/glm/core/setup.hpp
@@ -171,6 +171,8 @@
 #define GLM_COMPILER_CLANG31		0x20000060
 #define GLM_COMPILER_CLANG32		0x20000070
 #define GLM_COMPILER_CLANG33		0x20000080
+#define GLM_COMPILER_CLANG40		0x20000090
+#define GLM_COMPILER_CLANG41		0x200000A0
 
 // LLVM GCC
 #define GLM_COMPILER_LLVM_GCC		0x40000000
@@ -282,6 +284,10 @@
 #		define GLM_COMPILER GLM_COMPILER_CLANG32
 #	elif(__clang_major__ == 3) && (__clang_minor__ == 3)
 #		define GLM_COMPILER GLM_COMPILER_CLANG33
+#	elif(__clang_major__ == 4) && (__clang_minor__ == 0)
+#		define GLM_COMPILER GLM_COMPILER_CLANG40
+#	elif(__clang_major__ == 4) && (__clang_minor__ == 1)
+#		define GLM_COMPILER GLM_COMPILER_CLANG41
 #	else
 #		define GLM_COMPILER GLM_COMPILER_CLANG
 #   endif
diff --git a/test/core/core_setup_message.cpp b/test/core/core_setup_message.cpp
index b77d7bad..463a2f9a 100644
--- a/test/core/core_setup_message.cpp
+++ b/test/core/core_setup_message.cpp
@@ -148,8 +148,8 @@ int test_compiler()
 	}
 	else if(GLM_COMPILER & GLM_COMPILER_CLANG)
 	{
-		std::cout << "GLM_COMPILER_CLANG" << std::endl;	
-
+		std::cout << "GLM_COMPILER_CLANG " << __clang_major__ << "." << __clang_minor__ << std::endl;
+        
 		switch(GLM_COMPILER)
 		{
 		case GLM_COMPILER_CLANG26:
@@ -170,9 +170,17 @@ int test_compiler()
 		case GLM_COMPILER_CLANG31:
 			std::cout << "GLM_COMPILER_CLANG31" << std::endl;		
 			break;
+        case GLM_COMPILER_CLANG32:
+            std::cout << "GLM_COMPILER_CLANG32" << std::endl;
+            break;
+        case GLM_COMPILER_CLANG33:
+            std::cout << "GLM_COMPILER_CLANG33" << std::endl;
+            break;
+        case GLM_COMPILER_CLANG40:
+            std::cout << "GLM_COMPILER_CLANG40" << std::endl;
+            break;
 		default:
 			std::cout << "Clang version not detected" << std::endl;
-			Error += 1;
 			break;
 		}
 	}