diff --git a/ja/Makefile b/ja/Makefile
index 0633b461cf..f7850f32bc 100644
--- a/ja/Makefile
+++ b/ja/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/ja/Makefile,v 1.73 2006/08/20 06:28:53 hrs Exp $
+# $FreeBSD: www/ja/Makefile,v 1.74 2009/07/21 06:12:12 hrs Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.114
 
@@ -54,7 +54,7 @@ SUBDIR+= docproj
 SUBDIR+= news
 #SUBDIR+= advocacy
 
-#SUBDIR+= events
+SUBDIR+= events
 SUBDIR+= FAQ
 SUBDIR+= handbook
 SUBDIR+= tutorials
diff --git a/ja/events/Makefile b/ja/events/Makefile
new file mode 100644
index 0000000000..5fb2bddc93
--- /dev/null
+++ b/ja/events/Makefile
@@ -0,0 +1,40 @@
+# $FreeBSD$
+# The FreeBSD Japanese Documentation Project
+# Original revision: 1.18
+
+.if exists(../Makefile.conf)
+.include "../Makefile.conf"
+.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
+
+#SUBDIR=  2002
+#SUBDIR+= 2003
+
+# The year the top level events.html file starts from:
+YEARSTART= 2009
+# Years to generate past events pages for and link from top level:
+PASTYEARS= 2008 2007 2006 2005 2004 2003
+
+DATA=	events.css
+INDEXLINK=	events.html
+
+XMLDOCS+=		events:${XSL_EVENTS}:${XML_EVENTS_EVENTS}:
+PARAMS.events=		--param startyear ${YEARSTART}
+PARAMS.events+=		--stringparam pastyears '${PASTYEARS}'
+DEPENDSET.events=	events
+
+.for year in ${PASTYEARS}
+XMLDOCS+=		events${year}:${XSL_EVENTS_PAST}:${XML_EVENTS_EVENTS}:
+PARAMS.events${year}=	--param year ${year}
+PARAMS.events${year}+=	--stringparam pastyears '${PASTYEARS}'
+DEPENDSET.events${year}= events
+.endfor
+
+XMLDOCS+=		events_ics:${XSL_EVENTS_ICS}:${XML_EVENTS_EVENTS}:events.ics
+DEPENDSET.events_ics=	events
+
+XMLDOCS+=		events_rss:rss.xsl:${XML_EVENTS_EVENTS}:rss.xml
+
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ja/events/Makefile.inc b/ja/events/Makefile.inc
new file mode 100644
index 0000000000..f1732655fc
--- /dev/null
+++ b/ja/events/Makefile.inc
@@ -0,0 +1,6 @@
+# $FreeBSD$
+# The FreeBSD Japanese Documentation Project
+# Original revision: 1.2
+
+WEB_PREFIX?=	${.CURDIR}/../../..
+WEBBASE?=	/data/events
diff --git a/ja/events/events.css b/ja/events/events.css
new file mode 100644
index 0000000000..be3a63b414
--- /dev/null
+++ b/ja/events/events.css
@@ -0,0 +1,23 @@
+/* $FreeBSD$ */
+
+/*
+ * The FreeBSD Japanese Documentation Project
+ * Original revision: 1.2
+ */
+
+div.topic {
+	margin-top: 1em;
+	margin-bottom: 1em;
+}
+
+div.discussion {
+	margin-left: 1cm;
+}
+
+strong.speaker {
+	color: #660000;
+}
+
+strong.action {
+	color: red;
+}
diff --git a/ja/events/rss.xsl b/ja/events/rss.xsl
new file mode 100644
index 0000000000..49eaad7407
--- /dev/null
+++ b/ja/events/rss.xsl
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD Fragment//EN"
+				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd" [
+<!ENTITY title "FreeBSD Events">
+<!ENTITY email "freebsd-www">
+<!ENTITY % navinclude.about "INCLUDE">
+]>
+
+<!-- $FreeBSD$ -->
+<!-- The FreeBSD Japanese Documentation Project -->
+<!-- Original revision: 1.1 -->
+
+<!-- Copyright (c) 2008 Murray Stokely <murray@FreeBSD.org>
+     Copyright (c) 2003 Simon L. Nielsen <simon@FreeBSD.org>
+
+     All rights reserved.
+
+     Redistribution and use in source and binary forms, with or without
+     modification, are permitted provided that the following conditions
+     are met:
+     1. Redistributions of source code must retain the above copyright
+	notice, this list of conditions and the following disclaimer.
+     2. Redistributions in binary form must reproduce the above copyright
+	notice, this list of conditions and the following disclaimer in the
+	documentation and/or other materials provided with the distribution.
+
+     THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+     ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+     IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+     ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+     FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+     DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+     OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+     SUCH DAMAGE.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+  xmlns:cvs="http://www.FreeBSD.org/XML/CVS"
+  xmlns:date="http://exslt.org/dates-and-times"
+  extension-element-prefixes="date"
+  exclude-result-prefixes="cvs">
+
+  <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
+
+  <xsl:variable name="date">
+    <xsl:value-of select="//cvs:keyword[@name='freebsd']"/>
+  </xsl:variable>
+
+  <xsl:output method="xml" indent="yes"/>
+
+  <xsl:key name="event-by-month" match="event"
+    use="concat(startdate/year, format-number(startdate/month, '00'))"/>
+
+  <!-- Template: events -->
+  <xsl:template match="events">
+    <xsl:variable name="title">Upcoming FreeBSD Events</xsl:variable>
+    <xsl:variable name="link">http://www.FreeBSD.org/events/</xsl:variable>
+
+    <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+      <channel>
+        <title><xsl:value-of select="$title" /></title>
+        <link><xsl:value-of select="$link" /></link>
+        <description>RSS feed of upcoming FreeBSD-related conferences, summits, courses, and other relevant events.</description>
+        <language>en-us</language>
+        <webMaster>freebsd-www@FreeBSD.org (FreeBSD Web Team)</webMaster>
+        <managingEditor>freebsd-www@FreeBSD.org (FreeBSD Web Team)</managingEditor>
+        <docs>http://blogs.law.harvard.edu/tech/rss</docs>
+        <ttl>120</ttl>
+        <image>
+          <url>http://www.FreeBSD.org/logo/logo-full.png</url>
+          <title><xsl:value-of select="$title" /></title>
+          <link><xsl:value-of select="$link" /></link>
+        </image>
+        <atom:link rel="self" type="application/rss+xml">
+          <xsl:attribute name="href">
+            <xsl:value-of select="$link" /><xsl:text>rss.xml</xsl:text>
+          </xsl:attribute>
+        </atom:link>
+
+	<xsl:for-each select="event[generate-id() =
+          generate-id(key('event-by-month',
+	    concat(startdate/year, format-number(startdate/month, '00')))[1])
+	  and ((number(enddate/year) &gt; number($curdate.year)) or
+	    (number(enddate/year) = number($curdate.year) and
+	     number(enddate/month) &gt; number($curdate.month)) or
+	    (number(enddate/year) = number($curdate.year) and
+	     number(enddate/month) = number($curdate.month) and
+	     enddate/day &gt;= $curdate.day))]">
+
+	  <xsl:sort select="startdate/year" order="ascending"/>
+	  <xsl:sort select="format-number(startdate/month, '00')" order="ascending"/>
+	  <xsl:sort select="format-number(startdate/day, '00')" order="ascending"/>
+
+          <xsl:variable name="guid"><xsl:value-of select="url"/></xsl:variable>
+
+          <item>
+            <title><xsl:value-of select="name"/></title>
+            <description>
+              <xsl:value-of select="name"/>
+              <xsl:if test="url">
+                <xsl:text> (</xsl:text>
+                <xsl:value-of select="url"/>
+                <xsl:text>)</xsl:text>
+              </xsl:if>
+
+              <xsl:if test="location/site!=''">
+                <xsl:text>, </xsl:text>
+                <xsl:value-of select="location/site"/>
+              </xsl:if>
+              <xsl:if test="location/city!=''">
+                <xsl:text>, </xsl:text>
+                <xsl:value-of select="location/city"/>
+              </xsl:if>
+              <xsl:if test="location/state!=''">
+                <xsl:text>, </xsl:text>
+                <xsl:value-of select="location/state"/>
+              </xsl:if>
+              <xsl:if test="location/country!=''">
+                <xsl:text>, </xsl:text>
+                <xsl:value-of select="location/country"/>
+              </xsl:if>
+
+              <xsl:text> </xsl:text>
+
+              <xsl:call-template name="gen-date-interval">
+                <xsl:with-param name="startdate" select="startdate" />
+                <xsl:with-param name="enddate" select="enddate" />
+              </xsl:call-template>
+
+              <xsl:text>. </xsl:text>
+
+              <xsl:apply-templates select="description"/>
+
+            </description>
+
+            <link><xsl:value-of select="$guid" /></link>
+            <guid><xsl:value-of select="$guid" /></guid>
+          </item>
+        </xsl:for-each>
+
+      </channel>
+    </rss>
+
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ja/share/sgml/libcommon.xsl b/ja/share/sgml/libcommon.xsl
index a07c1db13c..caa8bb3150 100644
--- a/ja/share/sgml/libcommon.xsl
+++ b/ja/share/sgml/libcommon.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="euc-jp"?>
 <!DOCTYPE xsl:stylesheet PUBLIC "-//FreeBSD//DTD FreeBSD XSLT 1.0 DTD//EN"
 				"http://www.FreeBSD.org/XML/www/share/sgml/xslt10-freebsd.dtd">
-<!-- $FreeBSD: www/ja/share/sgml/libcommon.xsl,v 1.1 2006/08/19 21:24:50 hrs Exp $ -->
+<!-- $FreeBSD: www/ja/share/sgml/libcommon.xsl,v 1.2 2010/01/04 13:32:24 ryusuke Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:import href="http://www.FreeBSD.org/XML/www/share/sgml/libcommon.xsl"/>
@@ -81,10 +81,31 @@
   </xsl:template>
 
   <xsl:template name="html-events-list-preface">
+    <p>ここに載っていない FreeBSD に関連したイベントや、
+      FreeBSD ユーザが興味をもちそうなイベントをご存じなら、
+      我々がここに載せられるように詳細を
+      <a href="mailto:www@freebsd.org">www@FreeBSD.org</a> まで
+      (英語で) 送ってください。</p>
+
     <p>iCalendar 形式に対応したスケジュール管理ソフトウェアを使っているなら、
-      イベントを集めた
-      <a href="&enbase;/events/events.ics">FreeBSD イベントカレンダー</a>
-      が利用できます。</p>
+      ここに載っているすべてのイベントを集めた
+      <a href="&base;/events/events.ics">FreeBSD イベントカレンダー</a>
+      を利用できます。</p>
+  </xsl:template>
+
+  <xsl:template name="html-events-map">
+    <xsl:param name="mapurl" select="'none'" />
+
+    <p>今後 FreeBSD に関連したイベントを開催する国や地域は、
+      以下の地図において暗赤色に塗られています。
+      過去に FreeBSD に関連したイベントを開催した国は黄色やオレンジ色で塗られています。
+      より暗い色で塗られた地域ほど過去に多くのイベントを開催しています。</p>
+
+    <img>
+      <xsl:attribute name="src">
+        <xsl:value-of select="$mapurl" />
+      </xsl:attribute>
+    </img>
   </xsl:template>
 
   <xsl:template name="html-events-list-upcoming-heading">