===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/events.html,v
retrieving revision 1.1022
retrieving revision 1.1023
diff -u -r1.1022 -r1.1023
--- www/events.html	2016/02/23 17:30:03	1.1022
+++ www/events.html	2016/03/01 20:01:54	1.1023
@@ -37,14 +37,35 @@
 <h2>Future events:</h2>
 <ul>
 
+<li><strong><a name="bsdcan2016"></a>
+<a href="http://www.bsdcan.org/2016/">BSDCan 2016</a></strong>,
+June 8 - 11, 2016, Ottawa, Canada.<br>
+<ul>
+<li>Sebastian Benoit, Open Source Routing
+<li>Mike Belopuhov, Implementation of Xen PVHVM Drivers in OpenBSD
+<li>Henning Brauer, Running an ISP on OpenBSD
+<li>Reyk Fl&ouml;ter: An OpenFlow Implementation for OpenBSD.
+<li>Peter Hessler, Bidirectional Forwarding Detection (BFD) Implementation
+    and Support in OpenBSD
+<li>Antoine Jacoutot, OpenBSD rc.d(8)
+</ul>
+<p>
 <li><strong><a name="dotsecurity2016"></a>
 <a href="http://www.dotsecurity.io/">dotSecurity</a></strong>,
 Apr 22, 2016, Paris, France.<br>
 Theo de Raadt will present a talk about pledge(2)'s relationship to privilege
 separation.
 <p>
-
+<li><strong><a name="asiabsdcon2016"></a>
+<a href="http://2016.asiabsdcon.org">AsiaBSDCon 2016</a></strong>,
+March 10-13, 2016, Tokyo Japan.<br>
+<ul>
+<li>Mike Belopuhov, Implementation of Xen PVHVM drivers in OpenBSD
+<li>Henning Brauer, Running an ISP on OpenBSD
+<li>Antoine Jacoutot, OpenBSD rc.d(8)
 </ul>
+<p>
+</ul>
 <hr>
 
 <h2>Past events:</h2>
@@ -115,7 +136,7 @@
 <li>Marc Espie:
 <a href="papers/eurobsdcon2015-packages.pdf">Faster and more secure packages in OpenBSD</a>
 <li>Ingo Schwarze:
-<a href="papers/eurobsdcon2015-mandoc.pdf">mandoc: from scratch 
+<a href="papers/eurobsdcon2015-mandoc.pdf">mandoc: from scratch
 to the standard BSD documenation toolkit in 6 years</a>
 (roff/mm/gpresent <a href="papers/eurobsdcon2015-mandoc.roff">source code</a>)
 </ul>
@@ -491,7 +512,7 @@
 <li><strong><a name="bsdcan2012"></a>
 <a href="http://www.bsdcan.org/2012/">BSDCan 2012</a></strong>,
 May 9 - 12, 2012, Ottawa, Canada.<br>
-Henning Brauer gave a talk about the upcoming 
+Henning Brauer gave a talk about the upcoming
 <a href="http://bulabula.org/papers/2012/bsdcan/">new queueing subsystem</a>.
 <p>
 
@@ -516,7 +537,7 @@
 <li><strong><a name="opensourcedayscopenhagen2012"></a>
 <a href="http://www.opensourcedays.org/2012/">Open Source Days</a></strong>,
 Mar 8 - 11, 2012, Copenhagen, Denmark.<br>
-Peter Hansteen gave PF tutorials. 
+Peter Hansteen gave PF tutorials.
 <p>
 </ul>
 
@@ -527,12 +548,12 @@
 <a href="http://www.bsdday.org.ar/">BSDday Argentina 2011</a></strong>,
 Nov 5, 2011, Universidad Tecnologica Nacional, Buenos Aires City, Argentina.<br>
 <p>
-  
+
 <li><strong><a name="eurobsdcon2011"></a>
 <a href="http://2011.eurobsdcon.org/">EuroBSDCon 2011</a></strong>,
 October 6 - 9, 2011, Maarssen (near Utrecht) in The Netherlands.<br>
 Henning Brauer gave an <a href="http://bulabula.org/papers/2011/eurobsdcon-openbsdupdate">OpenBSD Update</a><br>
-Henning Brauer and Ryan McBride gave a talk 
+Henning Brauer and Ryan McBride gave a talk
 <a href="http://bulabula.org/papers/2011/pf10yrs/">OpenBSD PF's 10th
 Anniversary</a><br>
 Paul Irofti presented a paper about
@@ -552,12 +573,12 @@
 August 6, 2011, Stockholm, Sweden.<br>
 Jonathan Gray gave an
 <a href="papers/slackathon2011_update/index.html">OpenBSD Update</a>.<br>
-Ariane van der Steldt gave talks about 
+Ariane van der Steldt gave talks about
 <a href="papers/slackathon2011_vmmap/index.html">vmmap</a>
 and <a href="papers/slackathon2011_64bitandjit/index.html">64 bit and jit</a>.<br>
 Paul Irofti gave a talk about
 <a href="papers/slack2k11-on_compat_linux.pdf">the Compatibility Layer in OpenBSD 5.0</a>.<br>
-Henning Brauer gave a talk titled  
+Henning Brauer gave a talk titled
 <a href="http://bulabula.org/papers/2011/pf10yrs/">10 years of PF</a>.<br>
 <p>
 
@@ -761,7 +782,7 @@
 <li><strong><a name='dcbsdcon2009'></a>
 <a href="http://www.dcbsdcon.org/">DCBSDCon 2009</a></strong>,
 Feb 5 - 6, 2009, Washington, D.C., USA.<br>
-Henning Brauer gave a talk about 
+Henning Brauer gave a talk about
 <a href='http://bulabula.org/papers/dcbsdcon2009/'>
 Performance Tuning in the OpenBSD Network Stack and PF</a>.<br>
 Ted Unangst presented
@@ -804,7 +825,7 @@
 <li><strong><a name="ukuugpf2008london"></a>
 <a href="http://www.ukuug.org/events/pftutorial/">UKUUG Full-day PF tutorial</a></strong>,
 Nov 26 2008, London, UK.<br>
-The UKUUG hosted a full-day PF tutorial by Peter Hansteen (Book of PF author), 
+The UKUUG hosted a full-day PF tutorial by Peter Hansteen (Book of PF author),
 at the Caesar Room, Imperial Hotel, London.
 <p>