===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.613
retrieving revision 1.614
diff -u -r1.613 -r1.614
--- www/events.html	2007/02/19 22:18:20	1.613
+++ www/events.html	2007/02/20 20:24:34	1.614
@@ -70,7 +70,10 @@
 March 8 - 11, 2007, Tokyo, Japan.<br>
 Marc Balmer will give a talk "Support for GPS- and Time Signal Station Receivers
 in OpenBSD".<br>
-Damien Miller will present a paper on "Security measures in OpenSSH".
+Ryan McBride will give talks on "OpenBSD as a Development Platform" and "OpenBSD Network Randomness Injection: Further Improvements".<br>
+Mathieu Sauve-Frankel will give a talk "Recent Improvements in OpenBSD's IPSec Support".<br>
+Damien Miller will present a paper on "Security measures in OpenSSH".<br>
+There will be two PF tutorials back to back, Peter Hansteen's "Firewalling with OpenBSD's PF packet filter" and Ryan McBride's "Advanced PF Rulesets".
 <p>
 
 <li><strong><a name="litol07"></a>                                             
@@ -94,6 +97,13 @@
 run by the usual suspects.
 <p>
 
+<li><strong><a name="bsdcan2007"></a>
+<a href="http://www.bsdcan.org/">BSDCan 2007</a></strong>,
+May 16 - 19, 2007, Ottawa, Canada.<br>
+Several OpenBSD developers will be there.  Peter Hansteen will give a "Packet filtering for fun and profit" tutorial and present a "Fighting malware and spam with free tools" talk.
+<p>
+
+
 <li><strong><a name="eurobsdcon2007"></a>
 <a href="http://2007.eurobsdcon.org/">EuroBSDCon 2007</a></strong>,
 September 14 - 15, 2007, Copenhagen, Denmark.<br>
@@ -2208,7 +2218,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.613 2007/02/19 22:18:20 djm Exp $</small>
+<br><small>$OpenBSD: events.html,v 1.614 2007/02/20 20:24:34 deraadt Exp $</small>
 
 </body>
 </html>