diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c
index da9d636c76e68a46cc9754a2397d0a1cbd4d1d3d..6fb56ebfdcf3f180d1f36b63acc1cb991bf5ab1c 100644
--- a/tools/virsh-completer.c
+++ b/tools/virsh-completer.c
@@ -23,6 +23,7 @@
 #include <config.h>
 
 #include "virsh-completer.h"
+#include "virsh-domain.h"
 #include "virsh.h"
 #include "virsh-pool.h"
 #include "virsh-util.h"
@@ -676,3 +677,29 @@ virshSecretEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED,
     virStringListFree(ret);
     return NULL;
 }
+
+
+char **
+virshDomainEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED,
+                              const vshCmd *cmd ATTRIBUTE_UNUSED,
+                              unsigned int flags)
+{
+    size_t i = 0;
+    char **ret = NULL;
+
+    virCheckFlags(0, NULL);
+
+    if (VIR_ALLOC_N(ret, VIR_DOMAIN_EVENT_ID_LAST + 1) < 0)
+        goto error;
+
+    for (i = 0; i < VIR_DOMAIN_EVENT_ID_LAST; i++) {
+        if (VIR_STRDUP(ret[i], virshDomainEventCallbacks[i].name) < 0)
+            goto error;
+    }
+
+    return ret;
+
+ error:
+    virStringListFree(ret);
+    return NULL;
+}
diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h
index c662267882d1ae7b50685bacd2d4000d9048d485..8763c4e2edb301f2bb9656e9754d657a0f346b6d 100644
--- a/tools/virsh-completer.h
+++ b/tools/virsh-completer.h
@@ -82,4 +82,8 @@ char ** virshSecretEventNameCompleter(vshControl *ctl,
                                       const vshCmd *cmd,
                                       unsigned int flags);
 
+char ** virshDomainEventNameCompleter(vshControl *ctl,
+                                      const vshCmd *cmd,
+                                      unsigned int flags);
+
 #endif
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 202b7406e248a91f0b31a5db0ca3ff3254af67f6..465574198a0cb311962aa5645e26dca0bdd40993 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -13339,6 +13339,7 @@ static const vshCmdOptDef opts_event[] = {
                                       0),
     {.name = "event",
      .type = VSH_OT_STRING,
+     .completer = virshDomainEventNameCompleter,
      .help = N_("which event type to wait for")
     },
     {.name = "all",