diff --git a/FindGLEW.cmake b/FindGLEW.cmake
index 6ae9a27..cb9f710 100644
--- a/FindGLEW.cmake
+++ b/FindGLEW.cmake
@@ -50,7 +50,6 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS ( GLEW
   )
 
 IF ( GLEW_LOCATION )
-
   SET( GLEW_INCLUDE_DIR "${GLEW_LOCATION}/include" CACHE STRING "GLEW include path")
 
   SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
@@ -68,10 +67,16 @@ IF ( GLEW_LOCATION )
 	  # MESSAGE ( "APPLE STATIC" )
 	  # MESSAGE ( "GLEW_LIBRARY_PATH = " ${GLEW_LIBRARY_PATH} )
 	ELSEIF (WIN32)
+      message("Windows Found!")
       # Link library
       SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
-      FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW32S PATHS ${GLEW_LOCATION}/lib )
-      FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEW32MXS PATHS ${GLEW_LOCATION}/lib )
+      if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+        FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW32S PATHS $ENV{GLEW_ROOT}/lib/x64 NO_DEFAULT_PATH)
+        message("64-bit library")
+      else( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+        FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW32S PATHS $ENV{GLEW_ROOT}/lib NO_DEFAULT_PATH)
+        message("32-bit library")
+      endif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
 	ELSE (APPLE)
       SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
       FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib
@@ -93,18 +98,11 @@ IF ( GLEW_LOCATION )
 	ELSEIF (WIN32)
       # Link library
       SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
-      FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW32 PATHS ${GLEW_LOCATION}/lib )
-      FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEW32mx PATHS ${GLEW_LOCATION}/lib )
-      # Load library
-      SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
-      FIND_LIBRARY ( GLEW_DLL_PATH GLEW32 PATHS ${GLEW_LOCATION}/bin
-		NO_DEFAULT_PATH
-		NO_SYSTEM_ENVIRONMENT_PATH
-		)
-      FIND_LIBRARY ( GLEWmx_DLL_PATH GLEW32mx PATHS ${GLEW_LOCATION}/bin
-		NO_DEFAULT_PATH
-		NO_SYSTEM_ENVIRONMENT_PATH
-		)
+      if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+        FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW32S PATHS $ENV{GLEW_ROOT}/lib/x64 NO_DEFAULT_PATH)
+      else( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+        FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW32S PATHS $ENV{GLEW_ROOT}/lib NO_DEFAULT_PATH)
+      endif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
 	ELSE (APPLE)
 	  # Unices
       FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib
--
libgit2 0.21.4