diff --git a/lib/qlang.py b/lib/qlang.py
index 5167d773a038661845f52960bac980d9123849ef..0c5169e030cf134614e5c30b4702707424df40a0 100644
--- a/lib/qlang.py
+++ b/lib/qlang.py
@@ -38,6 +38,7 @@ import pyparsing as pyp
 
 from ganeti import errors
 from ganeti import netutils
+from ganeti import utils
 
 
 # Logic operators with one or more operands, each of which is a filter on its
@@ -146,8 +147,10 @@ def BuildFilterParser():
   number = pyp.Combine(pyp.Optional(num_sign) + pyp.Word(pyp.nums))
   number.setParseAction(lambda toks: int(toks[0]))
 
+  quoted_string = pyp.quotedString.copy().setParseAction(pyp.removeQuotes)
+
   # Right-hand-side value
-  rval = (number | pyp.quotedString.setParseAction(pyp.removeQuotes))
+  rval = (number | quoted_string)
 
   # Boolean condition
   bool_cond = field_name.copy()
@@ -184,10 +187,22 @@ def BuildFilterParser():
   not_regexp_cond.setParseAction(lambda (field, value):
                                  [[OP_NOT, [OP_REGEXP, field, value]]])
 
+  # Globbing, e.g. name =* "*.site"
+  glob_cond = (field_name + pyp.Suppress("=*") + quoted_string)
+  glob_cond.setParseAction(lambda (field, value):
+                           [[OP_REGEXP, field,
+                             utils.DnsNameGlobPattern(value)]])
+
+  not_glob_cond = (field_name + pyp.Suppress("!*") + quoted_string)
+  not_glob_cond.setParseAction(lambda (field, value):
+                               [[OP_NOT, [OP_REGEXP, field,
+                                          utils.DnsNameGlobPattern(value)]]])
+
   # All possible conditions
   condition = (binary_cond ^ bool_cond ^
                in_cond ^ not_in_cond ^
-               regexp_cond ^ not_regexp_cond)
+               regexp_cond ^ not_regexp_cond ^
+               glob_cond ^ not_glob_cond)
 
   # Associativity operators
   filter_expr = pyp.operatorPrecedence(condition, [
diff --git a/man/ganeti.rst b/man/ganeti.rst
index 9b31845d79ee5827a902c830c492793ea8610b38..2fdcb44812dc41802ae358a407cd664f84e31fe4 100644
--- a/man/ganeti.rst
+++ b/man/ganeti.rst
@@ -265,6 +265,9 @@ Syntax in pseudo-BNF::
       */
       | <field> { =~ | !~ } m/<re>/<re-modifiers>
 
+      /* Globbing */
+      | <field> { =* | !* } <quoted-string>
+
       /* Boolean */
       | <field>
     }
@@ -283,6 +286,10 @@ Operators:
   Pattern match using regular expression
 *!~*
   Logically negated from *=~*
+*=\**
+  Globbing, see **glob**(7), though only * and ? are supported
+*!\**
+  Logically negated from *=\**
 *in*, *not in*
   Collection membership and negation
 
diff --git a/test/ganeti.qlang_unittest.py b/test/ganeti.qlang_unittest.py
index 74100d216d90a8e424e8fbcdbe6cea477d5df753..ed8f77f93c13dae07bf73e335ad80308df8dea0b 100755
--- a/test/ganeti.qlang_unittest.py
+++ b/test/ganeti.qlang_unittest.py
@@ -147,6 +147,12 @@ class TestParseFilter(unittest.TestCase):
       self._Test("notname =~ m%stest%s" % (i, i),
                  [qlang.OP_REGEXP, "notname", "test"])
 
+    self._Test("name =* '*.site'",
+               [qlang.OP_REGEXP, "name", utils.DnsNameGlobPattern("*.site")])
+    self._Test("field !* '*.example.*'",
+               [qlang.OP_NOT, [qlang.OP_REGEXP, "field",
+                               utils.DnsNameGlobPattern("*.example.*")]])
+
   def testAllFields(self):
     for name in frozenset(i for d in query.ALL_FIELD_LISTS for i in d.keys()):
       self._Test("%s == \"value\"" % name, [qlang.OP_EQUAL, name, "value"])