diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index b293813621b806aa7e0e0e5149b0c47bd2d339d2..647170fa28bd580e0f8f963b8743bb13eaeeafbe 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -8765,6 +8765,10 @@ static void get_mailbox_delimiter(MAILSTREAM *stream) {
 }
 
 #endif /* IMAP_STORAGE */
+
+/* This is a workaround so that menuselect displays a proper description
+ * AST_MODULE_INFO(, , "Comedian Mail (Voicemail System)"
+ */
  
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, tdesc,
 		.load = load_module,
diff --git a/build_tools/prep_moduledeps b/build_tools/prep_moduledeps
index d6ea8aef615c3872fae2aaa1807cc2cef89b0ec4..93dc896759cd45c12ecec307377e282df561c1d1 100755
--- a/build_tools/prep_moduledeps
+++ b/build_tools/prep_moduledeps
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 get_description() {
-	TDESC=`grep -e AST_MODULE_INFO ${1} | cut -d '"' -f 2`
+	TDESC=`grep -m 1 -e AST_MODULE_INFO ${1} | cut -d '"' -f 2`
 }
 
 process_dir() {
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 6d0c9ccd28fb5c7e12e6acae9be8ac7cb42ccef2..13088f86db0026879e22a1338d77ea7ae3445ced 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -12694,6 +12694,10 @@ static int reload(void)
 	return 0;
 }
 
+/* This is a workaround so that menuselect displays a proper description
+ * AST_MODULE_INFO(, , "Zapata Telephony"
+ */
+
 #ifdef ZAPATA_PRI
 #define tdesc "Zapata Telephony w/PRI"
 #else