--- a/axi/indexer.py
+++ b/axi/indexer.py
@@ -531,6 +531,10 @@
         # Index the package name with a special prefix, to be able to find this
         # document by exact package name match
         document.add_term("XP"+pkg.name)
+        # the query parser is very unhappy about "-" in the pkgname, this
+        # breaks e.g. FLAG_WILDCARD based matching, so we add a mangled
+        # name here
+        document.add_term("XPM"+pkg.name.replace("-","_"))
         # Have all the various plugins index their things
         for addon in self.plugins:
             addon.obj.index(document, pkg)
