diff --git a/Documentation/nvme-ave-discovery-log.txt b/Documentation/nvme-ave-discovery-log.txt
new file mode 100644
index 0000000000..75de361406
--- /dev/null
+++ b/Documentation/nvme-ave-discovery-log.txt
@@ -0,0 +1,51 @@
+nvme-ave-discovery-log(1)
+=========================
+
+NAME
+----
+nvme-ave-discovery-log - Retrieve AVE Discovery Log, show it
+
+SYNOPSIS
+--------
+[verse]
+'nvme ave-discovery-log' <device> [--rae | -r] [--verbose | -v]
+			[--output-format=<fmt> | -o <fmt>] [--timeout=<timeout>]
+
+DESCRIPTION
+-----------
+Retrieve AVE Discovery Log, show it
+
+The <device> parameter is mandatory NVMe character device (ex: /dev/nvme0).
+
+On success it returns 0, error code otherwise.
+
+OPTIONS
+-------
+-r::
+--rae::
+	Retain an Asynchronous Event.
+
+-v::
+--verbose::
+	Increase the information detail in the output.
+
+-o <fmt>::
+--output-format=<fmt>::
+	Set the reporting format to 'normal', 'json' or 'binary'. Only one
+	output format can be used at a time.
+
+-t <timeout>::
+--timeout=<timeout>::
+	Override default timeout value. In milliseconds.
+
+EXAMPLES
+--------
+* Has the program issue a ave-discovery-log
++
+------------
+# nvme ave-discovery-log /dev/nvme0
+------------
+
+NVME
+----
+Part of the nvme-user suite.
diff --git a/completions/_nvme b/completions/_nvme
index e89ff263a8..0a0b5a883f 100644
--- a/completions/_nvme
+++ b/completions/_nvme
@@ -116,6 +116,7 @@ _nvme () {
 	'reachability-groups-log:retrieve reachability groups log'
 	'reachability-associations-log:retrieve reachability associations log'
 	'host-discovery-log:retrieve host discovery log'
+	'ave-discovery-log:retrieve ave discovery log'
 	'version:show the program version'
 	'ocp:OCP cloud SSD extensions'
 	'solidigm:Solidigm plug-in extensions'
@@ -2757,6 +2758,22 @@ _nvme () {
 			_arguments '*:: :->subcmds'
 			_describe -t commands "nvme host-discovery-log" _hd_log
 			;;
+		(ave-discovery-log)
+			local _ad_log
+			_ad_log=(
+			/dev/nvme':supply a device to use (required)'
+			--rae':Retain an Asynchronous Event'
+			-r':alias for --rae'
+			--verbose':Increase the information detail in the output.'
+			-v':alias for --verbose'
+			--output-format=':Output format: normal|json|binary'
+			-o ':alias for --output-format'
+			--timeout=':value for timeout'
+			-t ':alias for --timeout'
+			)
+			_arguments '*:: :->subcmds'
+			_describe -t commands "nvme ave-discovery-log" _ad_log
+			;;
 		(version)
 			local _version
 			_version=(
diff --git a/completions/bash-nvme-completion.sh b/completions/bash-nvme-completion.sh
index 458763ba4c..2235c50863 100644
--- a/completions/bash-nvme-completion.sh
+++ b/completions/bash-nvme-completion.sh
@@ -516,6 +516,10 @@ nvme_list_opts () {
 		opts+=" --all-host-entries -a --rae -r --verbose -v \
 			--output-format= -o --timeout= -t"
 			;;
+		"ave-discovery-log")
+		opts+=" --rae -r --verbose -v --output-format= -o \
+			--timeout= -t"
+			;;
 		"version")
 		opts+=$NO_OPTS
 			;;
@@ -1747,7 +1751,7 @@ _nvme_subcmds () {
 		rotational-media-info-log changed-alloc-ns-list-log \
 		io-mgmt-recv io-mgmt-send dispersed-ns-participating-nss-log \
 		reachability-groups-log reachability-associations-log \
-		host-discovery-log"
+		host-discovery-log ave-discovery-log"
 
 	# Add plugins:
 	for plugin in "${!_plugin_subcmds[@]}"; do