diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99d68ef86..d40938c9f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,8 @@ project(Magnum)
 
 include(CMakeDependentOption)
 
-option(TARGET_GLES "Build for OpenGL ES 2 instead of desktop OpenGL" OFF)
+option(TARGET_GLES "Build for OpenGL ES instead of desktop OpenGL" OFF)
+cmake_dependent_option(TARGET_GLES2 "Build for OpenGL ES 2" ON "TARGET_GLES" OFF)
 
 # Parts of the library
 option(WITH_EVERYTHING "Build everything (doesn't include contexts)" ON)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cc35b4470..02f4084c7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,6 +8,9 @@ endif()
 if(TARGET_GLES)
     set(MAGNUM_TARGET_GLES 1)
 endif()
+if(TARGET_GLES2)
+    set(MAGNUM_TARGET_GLES2 1)
+endif()
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/magnumConfigure.h.cmake
                ${CMAKE_CURRENT_BINARY_DIR}/magnumConfigure.h)
 
diff --git a/src/Query.cpp b/src/Query.cpp
index 9f23448b5..928e2a701 100644
--- a/src/Query.cpp
+++ b/src/Query.cpp
@@ -17,6 +17,7 @@
 
 namespace Magnum {
 
+#ifndef MAGNUM_TARGET_GLES2
 bool AbstractQuery::resultAvailable() {
     GLuint result;
     glGetQueryObjectuiv(query, GL_QUERY_RESULT_AVAILABLE, &result);
@@ -80,5 +81,6 @@ void SampleQuery::end() {
     delete target;
     target = nullptr;
 }
+#endif
 
 }
diff --git a/src/Query.h b/src/Query.h
index d7ea2fab9..e88f2af0a 100644
--- a/src/Query.h
+++ b/src/Query.h
@@ -25,6 +25,7 @@
 
 namespace Magnum {
 
+#ifndef MAGNUM_TARGET_GLES2
 /**
 @brief Base class for queries
 
@@ -339,6 +340,7 @@ class TimeQuery: public AbstractQuery {
         }
 };
 #endif
+#endif
 
 }
 
diff --git a/src/magnumConfigure.h.cmake b/src/magnumConfigure.h.cmake
index 9e8a3c7e8..7b42510db 100644
--- a/src/magnumConfigure.h.cmake
+++ b/src/magnumConfigure.h.cmake
@@ -1 +1,2 @@
 #cmakedefine MAGNUM_TARGET_GLES
+#cmakedefine MAGNUM_TARGET_GLES2