--- wikisrc/events.mdwn	2016/06/08 08:30:21	1.31
+++ wikisrc/events.mdwn	2016/06/20 01:38:24	1.32
@@ -8,14 +8,17 @@ For a list of NetBSD-related presentatio
 Future Events
 -------------
 
-### `Jun 2016` - Open Source Conference 2016 Hokkaido
+### `Jul 2016` - Open Source Conference 2016 Okinawa
 
-*Jun. 17-18, 2016, [Sapporo Convention Center](http://www.sora-scc.jp/access/index.html), Sapporo, Japan*
+*Jul. 2, 2016, [Okinawa Convention
+Center](http://www.oki-conven.jp/en/modules/tinyd7/page/page1.html) ,
+Okinawa, Japan*
 
 At the [Open Source Conference 2016
-Hokkaido](http://www.ospn.jp/osc2016-do/), there was a NetBSD
+Okinawa](http://www.ospn.jp/osc2016-okinawa/) , there will be a NetBSD
 booth staffed by members of the [Japan NetBSD Users'
-Group](http://www.jp.NetBSD.org/) with NetBSD gadget demonstrations. 
+Group](http://www.jp.NetBSD.org/) with NetBSD gadgets demonstration.
+
 
 
 ### `Jul 2016` - pkgsrcCon 2016, Kraków, Poland
@@ -41,6 +44,16 @@ from all over Europe and other parts of 
 Past Events
 -----------
 
+### `Jun 2016` - Open Source Conference 2016 Hokkaido
+
+*Jun. 17-18, 2016, [Sapporo Convention Center](http://www.sora-scc.jp/access/index.html), Sapporo, Japan*
+
+At the [Open Source Conference 2016
+Hokkaido](http://www.ospn.jp/osc2016-do/), there was a NetBSD
+booth staffed by members of the [Japan NetBSD Users'
+Group](http://www.jp.NetBSD.org/) with NetBSD gadget demonstrations. 
+[Report on netbsd-advocacy](http://mail-index.netbsd.org/netbsd-advocacy/2016/06/20/msg000709.html).
+
 ### `May 2016` - Open Source Conference 2016 Nagoya
 
 *May. 28, 2016, [Fukiage Hall](http://www.nipc.or.jp/fukiage/index.html), Nagoya, Japan*
@@ -197,6 +210,18 @@ staffed by members of the [Japan NetBSD 
 Group](http://www.jp.NetBSD.org/ja/JP/JNUG/) with many gadget
 demonstrations.[Report on netbsd-advocacy](http://mail-index.netbsd.org/netbsd-advocacy/2015/08/22/msg000692.html).
 
+### `Jul 2015` - Open Source Conference 2015 Okinawa
+
+*Jul. 4, 2015, [Okinawa Convention
+Center](http://www.oki-conven.jp/en/modules/tinyd7/page/page1.html) ,
+Okinawa, Japan*
+
+At the [Open Source Conference 2015
+Okinawa](http://www.ospn.jp/osc2015-okinawa/) , there was a NetBSD
+booth staffed by members of the [Japan NetBSD Users'
+Group](http://www.jp.NetBSD.org/) with NetBSD gadgets demonstration.
+[Report on NetBSD-advocacy](http://mail-index.netbsd.org/netbsd-advocacy/2015/07/04/msg000688.html).
+
 
 ### `Jun 2015` - Open Source Conference 2015 Hokkaido
 
@@ -292,6 +317,20 @@ Group](http://www.jp.NetBSD.org/) and [N
 with NetBSD gadget demonstrations ( [hpcarm](../ports/hpcarm/),
 [hpcmips](../ports/hpcmips/), [hpcsh](../ports/hpcsh/)).
 
+
+### `May 2014` - Open Source Conference 2014 Okinawa
+
+*May. 6, 2014, [Okinawa Convention
+Center](http://www.oki-conven.jp/en/modules/tinyd7/page/page1.html) ,
+Okinawa, Japan*
+
+At the [Open Source Conference 2014
+Okinawa](http://www.ospn.jp/osc2014-okinawa/) , there was a NetBSD
+booth staffed by members of the [Japan NetBSD Users'
+Group](http://www.jp.NetBSD.org/) with NetBSD gadgets demonstration.
+[more detail on togetter](http://togetter.com/li/671580).
+
+
 ### `Mar 2014` - Open Source Conference 2014 Hamanako
 
 *Mar. 22, 2014, [Hamamatsu Shimin Kyodo