diff --git a/completions/.gitignore b/completions/.gitignore
index bbd0645fe65..6e7d38cd6ff 100644
--- a/completions/.gitignore
+++ b/completions/.gitignore
@@ -408,6 +408,7 @@
 /vgsplit
 /vigr
 /_virtctl
+/_wasmer-headless
 /_watchexec
 /whatis
 /wine-development
diff --git a/completions/Makefile.am b/completions/Makefile.am
index 0542fff572e..b7cb70dff0a 100644
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@ -473,6 +473,7 @@ cross_platform = 2to3 \
 		vmstat \
 		vncviewer \
 		vpnc \
+		_wasmer \
 		watch \
 		webmitm \
 		wget \
@@ -1013,6 +1014,7 @@ CLEANFILES = \
 	vgsplit \
 	vigr \
 	_virtctl \
+	_wasmer-headless \
 	_watchexec \
 	whatis \
 	wine-development \
@@ -1392,6 +1394,8 @@ endif
 		vigr
 	$(ss) vncviewer \
 		tightvncviewer xvnc4viewer
+	$(ss) _wasmer \
+		_wasmer-headless
 	$(ss) wine \
 		wine-development wine-stable \
 		wine64 wine64-development wine64-stable
diff --git a/completions/_wasmer b/completions/_wasmer
new file mode 100644
index 00000000000..14c157c8542
--- /dev/null
+++ b/completions/_wasmer
@@ -0,0 +1,8 @@
+# 3rd party completion loader for commands emitting        -*- shell-script -*-
+# their completion using "$cmd gen-completions bash".
+#
+# This serves as a fallback in case the completion is not installed otherwise.
+
+eval -- "$("$1" gen-completions bash 2>/dev/null)"
+
+# ex: filetype=sh
diff --git a/test/fallback/completions/Makefile.am b/test/fallback/completions/Makefile.am
index cc887d839bf..28358b4e7d6 100644
--- a/test/fallback/completions/Makefile.am
+++ b/test/fallback/completions/Makefile.am
@@ -61,6 +61,7 @@ EXTRA_DIST = \
 	umount.linux \
 	uvx \
 	vault \
+	wasmer \
 	write \
 	xm \
 	yq \
diff --git a/test/fallback/completions/wasmer b/test/fallback/completions/wasmer
new file mode 120000
index 00000000000..7ae1f7b4be5
--- /dev/null
+++ b/test/fallback/completions/wasmer
@@ -0,0 +1 @@
+../../../completions/_wasmer
\ No newline at end of file