diff --git a/Makefile b/Makefile
index c0d754554..44d3080f3 100644
--- a/Makefile
+++ b/Makefile
@@ -940,7 +940,7 @@ menuselect/nmenuselect: menuselect/makeopts
 menuselect/makeopts: makeopts
 	+$(MAKE_MENUSELECT) makeopts
 
-menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml utils/utils.xml configure
+menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml utils/utils.xml agi/agi.xml configure
 	@echo "Generating input for menuselect ..."
 	@echo "<?xml version=\"1.0\"?>" > $@
 	@echo >> $@
@@ -952,6 +952,7 @@ menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(di
 		cat build_tools/cflags-devmode.xml >> $@; \
 	fi
 	@cat utils/utils.xml >> $@
+	@cat agi/agi.xml >> $@
 	@cat build_tools/embed_modules.xml >> $@
 	@cat sounds/sounds.xml >> $@
 	@echo "</menu>" >> $@
diff --git a/agi/Makefile b/agi/Makefile
index 46b7c3f39..591155dd1 100644
--- a/agi/Makefile
+++ b/agi/Makefile
@@ -11,9 +11,12 @@
 # the GNU General Public License
 #
 
+ASTTOPDIR?=..
+-include $(ASTTOPDIR)/menuselect.makeopts
+
 .PHONY: clean all uninstall
 
-AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
+AGIS=$(MENUSELECT_AGIS)
 
 ifeq ($(OSARCH),SunOS)
   LIBS+=-lsocket -lnsl
diff --git a/agi/agi.xml b/agi/agi.xml
new file mode 100644
index 000000000..1ae3c0e31
--- /dev/null
+++ b/agi/agi.xml
@@ -0,0 +1,14 @@
+<category name="MENUSELECT_AGIS" displayname="AGI Samples" positive_output="yes">
+  <member name="agi-test.agi">
+	<defaultenabled>no</defaultenabled>
+  </member>
+  <member name="eagi-test">
+	<defaultenabled>no</defaultenabled>
+  </member>
+  <member name="eagi-sphinx-test">
+	<defaultenabled>no</defaultenabled>
+  </member>
+  <member name="jukebox.agi">
+	<defaultenabled>no</defaultenabled>
+  </member>
+</category>