diff --git a/modules/FindGLFW.cmake b/modules/FindGLFW.cmake
index 099b61383..e831fdb2b 100644
--- a/modules/FindGLFW.cmake
+++ b/modules/FindGLFW.cmake
@@ -43,8 +43,7 @@ find_library(GLFW_LIBRARY NAMES glfw glfw3)
 
 # Include dir
 find_path(GLFW_INCLUDE_DIR
-    NAMES glfw3.h
-    PATH_SUFFIXES GLFW)
+    NAMES GLFW/glfw3.h)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args("GLFW" DEFAULT_MSG
diff --git a/src/Magnum/Platform/GlfwApplication.h b/src/Magnum/Platform/GlfwApplication.h
index 84cb5f15f..712efda2a 100644
--- a/src/Magnum/Platform/GlfwApplication.h
+++ b/src/Magnum/Platform/GlfwApplication.h
@@ -42,7 +42,7 @@
 /* We must include our own GL headers first to avoid conflicts */
 #include "Magnum/OpenGL.h"
 
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 
 namespace Magnum { namespace Platform {