diff --git a/Makefile b/Makefile
index 42867cd1e1..4c0d6d6fe3 100644
--- a/Makefile
+++ b/Makefile
@@ -953,6 +953,6 @@ mxml/libmxml.a:
 	@cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure
 	$(MAKE) -C mxml libmxml.a
 
-makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml
+makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml build_tools/sounds.xml
 	@echo "Generating list of available modules ..."
 	@build_tools/prep_moduledeps > $@
diff --git a/build_tools/prep_moduledeps b/build_tools/prep_moduledeps
index 650e24dfd6..a5a27b3743 100755
--- a/build_tools/prep_moduledeps
+++ b/build_tools/prep_moduledeps
@@ -57,4 +57,5 @@ process_dir funcs func FUNCS "Dialplan Functions"
 process_dir pbx pbx PBX "PBX Modules"
 process_dir res res RES "Resource Modules"
 cat build_tools/cflags.xml
+cat build_tools/sounds.xml
 echo "</menu>"
diff --git a/build_tools/sounds.xml b/build_tools/sounds.xml
new file mode 100644
index 0000000000..0f118f155c
--- /dev/null
+++ b/build_tools/sounds.xml
@@ -0,0 +1,19 @@
+	<category name="MENUSELECT_SOUNDS" displayname="Sound Packages" positive_output="yes">
+		<member name="CORE_SOUNDS_EN_WAV" displayname="Core Sounds - English, WAV format" />
+		<member name="CORE_SOUNDS_EN_ULAW" displayname="Core Sounds - English, mu-Law format" />
+		<member name="CORE_SOUNDS_EN_ALAW" displayname="Core Sounds - English, a-Law format" />
+		<member name="CORE_SOUNDS_EN_GSM" displayname="Core Sounds - English, GSM format" >
+			<defaultenabled>yes</defaultenabled>
+		</member>
+		<member name="CORE_SOUNDS_EN_G729" displayname="Core Sounds - English, G.729 format" />
+		<member name="CORE_SOUNDS_ES_WAV" displayname="Core Sounds - Spanish, WAV format" />
+		<member name="CORE_SOUNDS_ES_ULAW" displayname="Core Sounds - Spanish, mu-Law format" />
+		<member name="CORE_SOUNDS_ES_ALAW" displayname="Core Sounds - Spanish, a-Law format" />
+		<member name="CORE_SOUNDS_ES_GSM" displayname="Core Sounds - Spanish, GSM format" />
+		<member name="CORE_SOUNDS_ES_G729" displayname="Core Sounds - Spanish, G.729 format" />
+		<member name="CORE_SOUNDS_FR_WAV" displayname="Core Sounds - French, WAV format" />
+		<member name="CORE_SOUNDS_FR_ULAW" displayname="Core Sounds - French, mu-Law format" />
+		<member name="CORE_SOUNDS_FR_ALAW" displayname="Core Sounds - French, a-Law format" />
+		<member name="CORE_SOUNDS_FR_GSM" displayname="Core Sounds - French, GSM format" />
+		<member name="CORE_SOUNDS_FR_G729" displayname="Core Sounds - French, G.729 format" />
+	</category>