diff --git a/NEWS b/NEWS
index 10980fc22bc885d98cd8b3fba23881e5c8550545..458d9e84aea516efae47b489f7b4de3c2359b372 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,10 @@ Version 2.6.0 beta1
   upon recreation.
 - Removed deprecated ``QueryLocks`` LUXI request. Use
   ``Query(what=QR_LOCK, ...)`` instead.
+- The LUXI requests :pyeval:`luxi.REQ_QUERY_JOBS`,
+  :pyeval:`luxi.REQ_QUERY_INSTANCES`, :pyeval:`luxi.REQ_QUERY_NODES` and
+  :pyeval:`luxi.REQ_QUERY_GROUPS` are deprecated and will be removed in
+  a future version. :pyeval:`luxi.REQ_QUERY` should be used instead.
 
 
 Version 2.5.0 rc5
diff --git a/lib/build/sphinx_ext.py b/lib/build/sphinx_ext.py
index 6967a84c6ba12afa0690b2a0ce9f9fa54f9c554d..bd579ef677da1805d88dceac263e9551b7a89abd 100644
--- a/lib/build/sphinx_ext.py
+++ b/lib/build/sphinx_ext.py
@@ -41,6 +41,7 @@ from ganeti import utils
 from ganeti import opcodes
 from ganeti import ht
 from ganeti import rapi
+from ganeti import luxi
 
 import ganeti.rapi.rlib2 # pylint: disable=W0611
 
@@ -61,7 +62,7 @@ COMMON_PARAM_NAMES = _GetCommonParamNames()
 
 #: Namespace for evaluating expressions
 EVAL_NS = dict(compat=compat, constants=constants, utils=utils, errors=errors,
-               rlib2=rapi.rlib2)
+               rlib2=rapi.rlib2, luxi=luxi)
 
 # Constants documentation for man pages
 CV_ECODES_DOC = "ecodes"