diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 126068c94dd4ec23e619ed2332e4ce27c6c33f60..8f789c6c4ba96d38571432cdea68b2f2990c5c94 100644
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -60,6 +60,10 @@ static char *app = "ADSIProg";
 		<description>
 			<para>This application programs an ADSI Phone with the given script</para>
 		</description>
+		<see-also>
+			<ref type="application">GetCPEID</ref>
+			<ref type="filename">adsi.conf</ref>
+		</see-also>
 	</application>
  ***/
 
diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c
index 69abf6f38b0c4c998a9e41e30ca5c79ba1c0d658..88b2018f0310db10667d826c8c2191191a326ca7 100644
--- a/apps/app_authenticate.c
+++ b/apps/app_authenticate.c
@@ -98,6 +98,10 @@ static char *app = "Authenticate";
 			<para>When using a database key, the value associated with the key can be anything.</para>
 			<para>Users have three attempts to authenticate before the channel is hung up.</para>
 		</description>
+		<see-also>
+			<ref type="application">VMAuthenticate</ref>
+			<ref type="application">DISA</ref>
+		</see-also>
 	</application>
  ***/
 
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index f4a5a5d81f1ea7a4cc7959a87ec8575a627bea15..0f9ae44385f2236a10c17c0b77306bdfd05ad16f 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -164,6 +164,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 			single digit extension exists in the correct context ChanSpy will exit to it.
 			This also disables choosing a channel based on <literal>chanprefix</literal> and a digit sequence.</para></note>
 		</description>
+		<see-also>
+			<ref type="application">ExtenSpy</ref>
+		</see-also>
 	</application>
 	<application name="ExtenSpy" language="en_US">
 		<synopsis>
@@ -279,6 +282,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 			single digit extension exists in the correct context ChanSpy will exit to it.
 			This also disables choosing a channel based on <literal>chanprefix</literal> and a digit sequence.</para></note>
 		</description>
+		<see-also>
+			<ref type="application">ChanSpy</ref>
+		</see-also>
 	</application>
 
  ***/
diff --git a/apps/app_disa.c b/apps/app_disa.c
index 515bdce9c09ce12d37c93c0ab1c3a6ab85912c2c..80aeb09eacda55f81a627759fdfdc1d1b0fc6940 100644
--- a/apps/app_disa.c
+++ b/apps/app_disa.c
@@ -104,6 +104,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 			line, with the sole exception of the options. The file may contain blank
 			lines, or comments starting with <literal>#</literal> or <literal>;</literal>.</para>
 		</description>
+		<see-also>
+			<ref type="application">Authenticate</ref>
+			<ref type="application">VMAuthenticate</ref>
+		</see-also>
 	</application>
  ***/
 static char *app = "DISA";
diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c
index e2300dbeae790f8182d5d2469f7be6f559657857..d3bf17f6cd35b76ce6dbed6bbdb5654248222c0a 100644
--- a/apps/app_dumpchan.c
+++ b/apps/app_dumpchan.c
@@ -52,6 +52,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 			displayed when the verbose level is currently set to that number
 			or greater.</para>
 		</description>
+		<see-also>
+			<ref type="application">NoOp</ref>
+			<ref type="application">Verbose</ref>
+		</see-also>
 	</application>
  ***/
 
diff --git a/apps/app_image.c b/apps/app_image.c
index e74397c0dedbd443400399be9a717bb0357afd6e..a6fbac50cefe9dd8a26d12bc68d7d317e5fa9101 100644
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -62,6 +62,10 @@ static char *app = "SendImage";
 				</variable>
 			</variablelist>
 		</description>
+		<see-also>
+			<ref type="application">SendText</ref>
+			<ref type="application">SendURL</ref>
+		</see-also>
 	</application>
  ***/
 
diff --git a/apps/app_page.c b/apps/app_page.c
index ddebbf0ac8537597cc462fe051cba0b336b60c96..7d1dca447b912c748ebf6c070bef76bf5bdd05a8 100644
--- a/apps/app_page.c
+++ b/apps/app_page.c
@@ -91,6 +91,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 			caller is dumped into the conference as a speaker and the room is
 			destroyed when the original callers leaves.</para>
 		</description>
+		<see-also>
+			<ref type="application">MeetMe</ref>
+		</see-also>
 	</application>
  ***/
 static const char *app_page= "Page";
diff --git a/apps/app_stack.c b/apps/app_stack.c
index beeea30f638b17e7456c878ae3a716c636df24db..45db41d05ec2355684dabec8cc60061e1ab0c713 100644
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -59,6 +59,13 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 		<description>
 			<para>Jumps to the label specified, saving the return address.</para>
 		</description>
+		<see-also>
+			<ref type="application">GosubIf</ref>
+			<ref type="application">Macro</ref>
+			<ref type="application">Goto</ref>
+			<ref type="application">Return</ref>
+			<ref type="application">StackPop</ref>
+		</see-also>
 	</application>
 	<application name="GosubIf" language="en_US">
 		<synopsis>
@@ -82,6 +89,13 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 			labeliffalse, if specified.  In either case, a jump saves the return point
 			in the dialplan, to be returned to with a Return.</para>
 		</description>
+		<see-also>
+			<ref type="application">Gosub</ref>
+			<ref type="application">Return</ref>
+			<ref type="application">MacroIf</ref>
+			<ref type="function">IF</ref>
+			<ref type="application">GotoIf</ref>
+		</see-also>
 	</application>
 	<application name="Return" language="en_US">
 		<synopsis>
@@ -96,6 +110,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 			<para>Jumps to the last label on the stack, removing it. The return <replaceable>value</replaceable>, if
 			any, is saved in the channel variable <variable>GOSUB_RETVAL</variable>.</para>
 		</description>
+		<see-also>
+			<ref type="application">Gosub</ref>
+			<ref type="application">StackPop</ref>
+		</see-also>
 	</application>
 	<application name="StackPop" language="en_US">
 		<synopsis>
@@ -105,6 +123,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 		<description>
 			<para>Removes last label on the stack, discarding it.</para>
 		</description>
+		<see-also>
+			<ref type="application">Return</ref>
+			<ref type="application">Gosub</ref>
+		</see-also>
 	</application>
 	<function name="LOCAL" language="en_US">
 		<synopsis>
diff --git a/main/pbx.c b/main/pbx.c
index 438403e933142d2e3a9b598d7b1fdce38dcdcfe2..8ae0879876cabff2e8176c871386a51358e58b05 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -4223,6 +4223,8 @@ static char *xmldoc_build_seealso(const char *type, const char *name)
 			ast_str_append(&outputstr, 0, "%s\n", content);
 		} else if (!strcasecmp(typename, "manpage")) {
 			ast_str_append(&outputstr, 0, "ManPage: %s\n", content);
+		} else if (!strcasecmp(typename, "filename")) {
+			ast_str_append(&outputstr, 0, "File: %s\n", content);
 		}
 		ast_xml_free_text(content);
 	}