===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- www/events.html	2005/02/27 10:54:22	1.301
+++ www/events.html	2005/02/27 11:03:17	1.302
@@ -52,6 +52,14 @@
 Ryan McBride will be presenting talks about PF and about
 randomization in the OpenBSD network layer.<br>
 Theo and Henning will be in attendance because someone has to heckle.
+<p>
+<li><strong><a name=bsdcan2005></a>
+<a href="http://www.bsdcan.org/">BSDCan 2005</a></strong>,
+May 13 - 14, 2005, Ottawa, Canada.<br>
+A number of OpenBSD developers will be presenting: Bob Beck on
+Spam Reduction with PF and Spamd, Henning Brauer on OpenBGPD,
+and Ryan McBride on Network Stack Randomness.
+Expect to find other OpenBSD developers in attendance as well.
 </ul>
 
 <hr>
@@ -301,8 +309,9 @@
 <a href="http://www.bsdcan.org/">BSDCan 2004</a></strong>,
 May 13 - 16, 2004, Ottawa, Canada.<br>
 BSDCan was held at the University of Ottawa.  Ryan McBride gave a talk
-about newer features in pf, focusing on the redundancy provided by CARP
-and pfsync.  Theo de Raadt presented a revised version of his talk on
+<a href="http://www.openbsd.org/papers/bsdcan04-pf/index.html">about newer features in pf</a>,
+focusing on the redundancy provided by CARP and pfsync.
+Theo de Raadt presented a revised version of his talk on
 <a href="papers/bsdcan04">Exploit Mitigation Techniques</a>.
 <p>
 
@@ -1308,7 +1317,7 @@
 <hr>
 <a href="index.html"><img height=24 width=24 src=back.gif border=0 alt="OpenBSD"></a>
 <a href="mailto:www@openbsd.org">www@openbsd.org</a>
-<br><small>$OpenBSD: events.html,v 1.301 2005/02/27 10:54:22 saad Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.302 2005/02/27 11:03:17 mcbride Exp $</small>
 
 </body>
 </html>