diff --git a/CMakeLists.txt b/CMakeLists.txt
index f694a0e..2d533c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,7 @@ include_directories(
 					${OpenGL_INCLUDE_DIRS}
 					${GLUT_INCLUDE_DIR}
 					${STIM_INCLUDE_DIRS}
-          			${ANN_INCLUDE_DIR}
+          ${ANN_INCLUDE_DIR}
 					${Boost_INCLUDE_DIR}
 					)
 
diff --git a/FindGLUT.cmake b/FindGLUT.cmake
index 906ef26..747c492 100644
--- a/FindGLUT.cmake
+++ b/FindGLUT.cmake
@@ -47,11 +47,26 @@
 if (WIN32)
   find_path( GLUT_INCLUDE_DIR NAMES GL/glut.h
   PATHS  $ENV{GLUT_ROOT_PATH}/include )
-  find_library( GLUT_glut_LIBRARY NAMES glut glut32 freeglut
-    PATHS
-    ${OPENGL_LIBRARY_DIR}
-    $ENV{GLUT_ROOT_PATH}/lib
+
+  if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+    find_library( GLUT_glut_LIBRARY NAMES freeglut
+      PATHS
+      $ENV{GLUT_ROOT_PATH}/lib/x64
+
+      NO_DEFAULT_PATH
+    )
+    message("GLUT 64-bit detected:")
+    message(${GLUT_glut_LIBRARY})
+  else( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+    find_library( GLUT_glut_LIBRARY NAMES glut glut32 freeglut
+      PATHS
+      ${OPENGL_LIBRARY_DIR}
+      $ENV{GLUT_ROOT_PATH}/lib
     )
+    message("GLUT 32-bit detected")
+
+  endif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+
 else ()
 
   if (APPLE)
--
libgit2 0.21.4