diff --git a/share/sgml/events.xml b/share/sgml/events.xml
index 4f59412dac..b8ce23cda9 100644
--- a/share/sgml/events.xml
+++ b/share/sgml/events.xml
@@ -10,10 +10,35 @@
 <events>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/events.xml,v 1.27 2007/10/04 20:41:20 delphij Exp $
+      $FreeBSD: www/share/sgml/events.xml,v 1.28 2007/10/21 19:08:14 brueffer Exp $
     </cvs:keyword>
   </cvs:keywords>
 
+  <event id="bsdcan-2008">
+    <name>BSDCan 2008</name>
+    <url>http://www.bsdcan.org/</url>
+    <startdate>
+      <year>2007</year>
+      <month>5</month>
+      <day>18</day>
+    </startdate>
+    <enddate>
+      <year>2007</year>
+      <month>5</month>
+      <day>19</day>
+    </enddate>
+    <location>
+      <country>Canada</country>
+      <city>Ottawa</city>
+      <site>University of Ottawa</site>
+    </location>
+    <description>BSDCan is a developers conference with a strong focus
+      on emerging technologies, research projects, and works in
+      progress. It also features Userland infrastructure projects and
+      invites contributions from both free software developers and those
+      from commercial vendors.</description>
+  </event>
+
   <event id="meetbsd-2007">
     <name>MeetBSD 2007</name>
     <url>http://2007.meetbsd.org/en/</url>
diff --git a/share/sgml/navibar.ent b/share/sgml/navibar.ent
index 4225d1db68..d9f6b2d490 100644
--- a/share/sgml/navibar.ent
+++ b/share/sgml/navibar.ent
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/share/sgml/navibar.ent,v 1.12 2007/09/12 02:11:47 bland Exp $ -->
+<!-- $FreeBSD: www/share/sgml/navibar.ent,v 1.13 2007/10/25 16:56:11 marcus Exp $ -->
 
 <!ENTITY % navinclude.about "IGNORE">
 <![ %navinclude.about; [
@@ -97,7 +97,9 @@
         <li><a href="&u.betarel.schedule;">Upcoming Release: &betarel.current;</a></li>
 ]]>
 <![ %beta2.testing; [ 
+<!--
         <li><a href="&u.betarel2.schedule;">Upcoming Release: &betarel2.current;</a></li>
+-->
 ]]>
       </ul></li>
     <li><a href="&base;/ports/">Ported Applications</a></li>