diff --git a/web/root/members/sysinfo.ssjs b/web/root/members/sysinfo.ssjs
index 514fb5925e92ffe778b8d0d469af92f80ed1ccbc..c640d03d0509a1720baf45aa543e1a38cf125fbe 100644
--- a/web/root/members/sysinfo.ssjs
+++ b/web/root/members/sysinfo.ssjs
@@ -21,6 +21,12 @@ else {
 template.logon.replace(/\r?\n/g,"\r\n");
 template.logon=html_encode(template.logon,true,false,true,true);
 
+template.fidoaddrs=new Array;
+for(addr in system.fido_addr_list) {
+	template.fidoaddrs[addr]=new Object;
+	template.fidoaddrs[addr].address=system.fido_addr_list[addr];
+}
+
 write_template("header.inc");
 write_template("sysinfo.inc");
 write_template("footer.inc");
diff --git a/web/templates/sysinfo.inc b/web/templates/sysinfo.inc
index 98ebb365eb2d4e7fb47534ed7e817adfae9ebbba..748d888198cb9cb83ebdf7acbe1fb770a9e5bed8 100644
--- a/web/templates/sysinfo.inc
+++ b/web/templates/sysinfo.inc
@@ -16,6 +16,16 @@
       %%JS:system.qwk_id%%
 	</td>
   </tr>
+<<REPEAT fidoaddrs>>
+  <tr>
+	<td>
+      FidoNet Address:
+	</td>
+	<td>
+      %%fidoaddrs:address%%
+	</td>
+  </tr>
+<<END REPEAT fidoaddrs>>
   <tr>
 	<td>
       Location: