diff --git a/.gitmodules b/.gitmodules
index 7a5873143bbf5..7510d1a707b74 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -26,3 +26,6 @@
 [submodule "pglite/other_extensions/pg_textsearch"]
 	path = pglite/other_extensions/pg_textsearch
 	url = https://github.com/timescale/pg_textsearch/
+[submodule "pglite/other_extensions/pgmq"]
+	path = pglite/other_extensions/pgmq
+	url = https://github.com/pgmq/pgmq
diff --git a/pglite/other_extensions/Makefile b/pglite/other_extensions/Makefile
index 29e8d27dedb5d..601f0ffb12545 100644
--- a/pglite/other_extensions/Makefile
+++ b/pglite/other_extensions/Makefile
@@ -8,7 +8,8 @@ SUBDIRS = \
 		age \
 		pg_uuidv7 \
 		pg_hashids \
-		pg_textsearch
+		pg_textsearch \
+		pgmq/pgmq-extension
 
 prefix ?= /pglite
 EXTENSIONS_BUILD_ROOT := /tmp/extensions/build
@@ -30,7 +31,7 @@ dist: $(addsuffix .tar.gz,$(EXTENSIONS))
 	mkdir -p $(ARCHIVE_DIR)
 	cd $(EXTENSIONS_BUILD_ROOT)/$*/$(prefix) && \
 	files=$$(find . -type f -o -type l | sed 's|^\./||') && \
-	tar -czf $(ARCHIVE_DIR)/$*.tar.gz $$files
+	tar -czf $(ARCHIVE_DIR)/$$(basename $*)\.tar.gz $$files
 
 # AGE requires SIZEOF_DATUM=4 for 32-bit WASM compatibility (strips PASSEDBYVALUE from graphid)
 age.tar.gz:
diff --git a/pglite/other_extensions/pgmq b/pglite/other_extensions/pgmq
new file mode 160000
index 0000000000000..885251cf4dcb4
--- /dev/null
+++ b/pglite/other_extensions/pgmq
@@ -0,0 +1 @@
+Subproject commit 885251cf4dcb4853d7fa253f56e382d84d5f0821