diff --git a/ja/security/Makefile b/ja/security/Makefile
index 84928c1d92..1d3f0317c9 100644
--- a/ja/security/Makefile
+++ b/ja/security/Makefile
@@ -1,28 +1,29 @@
-# $FreeBSD: www/ja/security/Makefile,v 1.15 2003/11/24 18:26:34 hrs Exp $
+# $FreeBSD: www/ja/security/Makefile,v 1.16 2004/01/10 18:38:00 rushani Exp $
 # The FreeBSD Japanese Documentation Project
-# Original revision: 1.9
+# Original revision: 1.11
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
 DOCS=  
 DOCS+=	security.sgml
 
 INDEXLINK= security.html
 
 ### Revision checking
 REVCHECK=	YES
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
 
 CLEANFILES+= advisories.html.inc
 
 security.html: advisories.html.inc
 
-advisories.html.inc: mkindex.xsl ${XML_ADVISORIES}
+advisories.html.inc: mkindex.xsl ${XML_ADVISORIES} ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
+		--param "advisories.xml" "'${XML_ADVISORIES}'" \
 		${.CURDIR}/mkindex.xsl ${XML_ADVISORIES}
diff --git a/ja/security/mkindex.xsl b/ja/security/mkindex.xsl
index a47d94d4c1..97f58ca3c1 100644
--- a/ja/security/mkindex.xsl
+++ b/ja/security/mkindex.xsl
@@ -1,50 +1,28 @@
 <?xml version="1.0" encoding="EUC-JP" ?>
 
-<!-- $FreeBSD$ -->
-<!-- Original revision: 1.2 -->
+<!-- $FreeBSD: www/ja/security/mkindex.xsl,v 1.1 2003/10/11 07:12:37 hrs Exp $ -->
+<!-- Original revision: 1.4 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   
   <xsl:import href="../includes.xsl"/>
 
   <xsl:variable name="base" select="'.'"/>
-  <xsl:variable name="date" select="'$FreeBSD$'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/ja/security/mkindex.xsl,v 1.1 2003/10/11 07:12:37 hrs Exp $'"/>
   <xsl:variable name="title" select="'untitled'"/>
 
-  <xsl:variable name="ftpbase" select="'ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/'" />
-  <xsl:variable name="ftpbaseold" select="'ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/old/'" />
-  <xsl:variable name="ulopen" select="'&lt;ul&gt;'" />
-  <xsl:variable name="ulclose" select="'&lt;/ul&gt;'" />
-
   <xsl:output type="xml" encoding="euc-jp"
               omit-xml-declaration="yes" />
 
   <xsl:template match="/">
-    <xsl:value-of select="$ulopen" disable-output-escaping="yes" />
-      <xsl:for-each select="descendant::advisory|descendant::release">
-        <xsl:choose>
-          <xsl:when test="self::release">
-            <xsl:value-of select="$ulclose" disable-output-escaping="yes" />
-            <p><xsl:value-of select="name"/> の公開。</p>
-            <xsl:value-of select="$ulopen" disable-output-escaping="yes" />
-          </xsl:when>
-          
-          <xsl:when test="self::advisory">
-            <li>
-            <xsl:choose>
-              <xsl:when test="./name/@role='old'">
-                <a><xsl:attribute name="href"><xsl:value-of select="concat($ftpbaseold, name, '.asc')" /></xsl:attribute><xsl:value-of select="concat(name, '.asc')" /></a>
-              </xsl:when>
-              <xsl:otherwise>
-                 <a><xsl:attribute name="href"><xsl:value-of select="concat($ftpbase, name, '.asc')" /></xsl:attribute><xsl:value-of select="concat(name, '.asc')" /></a>             </xsl:otherwise>
-            </xsl:choose>
-            <xsl:if test="./ulink/@lang='ja'">
-               <a><xsl:attribute name="href"><xsl:value-of select="ulink" /></xsl:attribute>(日本語訳)</a>
-            </xsl:if>
-            </li>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:for-each>
-    <xsl:value-of select="$ulclose" disable-output-escaping="yes" />
+    <xsl:call-template name="html-list-advisories">
+       <xsl:with-param name="advisories.xml" select="$advisories.xml" />
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template name="html-list-advisories-release-label">
+    <xsl:param name="relname" select="'none'" />
+
+    <p><xsl:value-of select="$relname" /> の公開。</p>
   </xsl:template>
 </xsl:stylesheet>