diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp
index ec6c7578..0dfd22c1 100644
--- a/glm/core/setup.hpp
+++ b/glm/core/setup.hpp
@@ -71,12 +71,20 @@
 //#define GLM_COMPILER_BCBX			0x03000400 // What's the version value?
 #define GLM_COMPILER_BCB2009		0x03000500
 
-#define GLM_MODEL_32				0x00000010
-#define GLM_MODEL_64				0x00000020
-
 // CodeWarrior
 #define GLM_COMPILER_CODEWARRIOR	0x04000000
 
+// CUDA
+#define GLM_COMPILER_CUDA           0x05000000
+#define GLM_COMPILER_CUDA30			0x05000010
+#define GLM_COMPILER_CUDA31			0x05000020
+#define GLM_COMPILER_CUDA32			0x05000030
+#define GLM_COMPILER_CUDA40			0x05000040
+
+// Build model
+#define GLM_MODEL_32				0x00000010
+#define GLM_MODEL_64				0x00000020
+
 // Force generic C++ compiler
 #ifdef GLM_FORCE_COMPILER_UNKNOWN
 #		define GLM_COMPILER GLM_COMPILER_UNKNOWN
@@ -160,6 +168,22 @@
 #elif defined(__MWERKS__)
 #	define GLM_COMPILER GLM_COMPILER_CODEWARRIOR
 
+// CUDA
+#elif defined(CUDA_VERSION)
+#	if CUDA_VERSION == 3000
+#		define GLM_COMPILER 
+#	elif CUDA_VERSION < 3000
+#		error ""
+#	elif CUDA_VERSION == 3000
+#		define GLM_COMPILER GLM_COMPILER_CUDA30	
+#	elif CUDA_VERSION == 3010
+#		define GLM_COMPILER GLM_COMPILER_CUDA31	
+#	elif CUDA_VERSION == 3020
+#		define GLM_COMPILER GLM_COMPILER_CUDA32	
+#	elif CUDA_VERSION == 4000
+#		define GLM_COMPILER GLM_COMPILER_CUDA40	
+#	endif
+
 #else
 #	define GLM_COMPILER GLM_COMPILER_UNKNOWN
 #endif