diff --git a/src/BroDoc.cc b/src/BroDoc.cc
index 23ed3ee189..cc209c4524 100644
--- a/src/BroDoc.cc
+++ b/src/BroDoc.cc
@@ -131,24 +131,23 @@ void BroDoc::WriteDocFile() const
 	if ( ! notices.empty() )
 		WriteBroDocObjList(notices, "Notices", '-');
 
+	WriteInterface("Public Interface", '-', '~', true);
+	WriteInterface("Private Interface", '-', '~', false);
+
 	if ( ! port_analysis.empty() )
 		{
 		WriteSectionHeading("Port Analysis", '-');
+		WriteToDoc(":ref:`More Information <common_port_analysis_doc>`\n\n");
 		WriteStringList("%s", port_analysis);
 		}
 
 	if ( ! packet_filter.empty() )
 		{
 		WriteSectionHeading("Packet Filter", '-');
-		WriteToDoc(".. note:: Filters are only relevant when dynamic protocol "
-		           "detection (DPD) is explicitly turned off (Bro release 1.6 "
-		           "enabled DPD by default).\n\n");
+		WriteToDoc(":ref:`More Information <common_packet_filter_doc>`\n\n");
 		WriteToDoc("Filters added::\n\n");
 		WriteToDoc("%s\n", packet_filter.c_str());
 		}
-
-	WriteInterface("Public Interface", '-', '~', true);
-	WriteInterface("Private Interface", '-', '~', false);
 	}
 
 void BroDoc::WriteInterface(const char* heading, char underline,