diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h
index 3b2d5b852..250f68e86 100644
--- a/include/GLFW/glfw3.h
+++ b/include/GLFW/glfw3.h
@@ -971,6 +971,11 @@ extern "C" {
  *  The vertical resize arrow shape.
  */
 #define GLFW_VRESIZE_CURSOR         0x00036006
+/*! @brief The wait/hourglass shape.
+ *
+ *  The wait/hourglass shape.
+ */
+#define GLFW_WAIT_CURSOR         0x00036007
 /*! @} */
 
 #define GLFW_CONNECTED              0x00040001
diff --git a/src/input.c b/src/input.c
index 7d7ccf3fc..1d6fdf09f 100644
--- a/src/input.c
+++ b/src/input.c
@@ -464,7 +464,8 @@ GLFWAPI GLFWcursor* glfwCreateStandardCursor(int shape)
         shape != GLFW_CROSSHAIR_CURSOR &&
         shape != GLFW_HAND_CURSOR &&
         shape != GLFW_HRESIZE_CURSOR &&
-        shape != GLFW_VRESIZE_CURSOR)
+        shape != GLFW_VRESIZE_CURSOR &&
+        shape != GLFW_WAIT_CURSOR)
     {
         _glfwInputError(GLFW_INVALID_ENUM, "Invalid standard cursor %i", shape);
         return NULL;
diff --git a/src/win32_window.c b/src/win32_window.c
index 6d691e196..dde888d47 100644
--- a/src/win32_window.c
+++ b/src/win32_window.c
@@ -324,6 +324,8 @@ static LPWSTR translateCursorShape(int shape)
             return IDC_SIZEWE;
         case GLFW_VRESIZE_CURSOR:
             return IDC_SIZENS;
+        case GLFW_WAIT_CURSOR:
+            return IDC_WAIT;
     }
 
     return NULL;
diff --git a/src/x11_window.c b/src/x11_window.c
index ed5a0f297..19c1d6576 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -182,6 +182,8 @@ static int translateCursorShape(int shape)
             return XC_sb_h_double_arrow;
         case GLFW_VRESIZE_CURSOR:
             return XC_sb_v_double_arrow;
+        case GLFW_WAIT_CURSOR:
+            return XC_watch;
     }
 
     return 0;