diff --git a/it/Makefile b/it/Makefile
index 13f95503db..b63447ea8c 100644
--- a/it/Makefile
+++ b/it/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/it/Makefile,v 1.12 2005/11/01 14:18:01 blackend Exp $
+# $FreeBSD: www/it/Makefile,v 1.13 2006/06/06 11:08:49 ale Exp $
 .if exists(Makefile.conf)
 .include "Makefile.conf"
 .endif
@@ -15,6 +15,14 @@ DOCS+= mailto.sgml
 DOCS+= support.sgml
 DOCS+= where.sgml
 
+XMLDOCS=	index:xsl:${XML_NEWS_NEWS}:
+DEPENDSET.index=transtable mirrors news press events \
+		advisories notices
+
+XMLDOCS+=	usergroups:${XSL_USERGROUPS}:${XML_USERGROUPS}:
+DEPENDSET.usergroups=transtable usergroups
+PARAMS.usergroups=	--param pagename "'FreeBSD User Groups'"
+
 # Subdirectories
 # SGML
 SUBDIR=  copyright
@@ -28,29 +36,4 @@ SUBDIR+= doc
 
 WEBDIR?=	data/it
 
-# index.html is special, and generated from index.xsl and news/news.xml
-DATA+=		index.html
-CLEANFILES+=	index.html
-
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
-
-index.html: index.xsl ${XML_INCLUDES} \
-		${XML_NEWS_INCLUDES_MASTER} \
-		${XML_NEWS_NEWS_MASTER} ${XML_NEWS_PRESS_MASTER} \
-		${XML_EVENTS_EVENTS_MASTER} ${XML_EVENTS_CURDATE} \
-		${XML_MIRRORS} ${XML_TRANSTABLE} \
-		${XML_ADVISORIES} ${XML_NOTICES}
-	${XSLTPROC} ${XSLTPROCOPTS} \
-		-o $@ \
-		--param advisories.xml "'${XML_ADVISORIES}'" \
-		--param curdate.xml "'${XML_EVENTS_CURDATE}'" \
-		--param events.xml "'${XML_EVENTS_EVENTS_MASTER}'" \
-		--param mirrors.xml "'${XML_MIRRORS}'" \
-		--param news.press.xml "'${XML_NEWS_PRESS_MASTER}'" \
-		--param news.project.xml "'${XML_NEWS_NEWS_MASTER}'" \
-		--param notices.xml "'${XML_NOTICES}'" \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
-		${.CURDIR}/index.xsl ${XML_NEWS_NEWS_MASTER}
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
diff --git a/it/index.xsl b/it/index.xsl
index 678b8fb388..f8ad1f3a0b 100644
--- a/it/index.xsl
+++ b/it/index.xsl
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Italian Documentation Project
 
-     $FreeBSD: www/it/index.xsl,v 1.30 2006/06/06 14:22:13 ale Exp $
+     $FreeBSD: www/it/index.xsl,v 1.31 2006/08/19 21:24:05 hrs Exp $
      Original revision: 1.138
 -->
 
@@ -195,7 +195,8 @@
 			<div class="newseventswrap">
 
 			<xsl:call-template name="html-index-news-project-items">
-				<xsl:with-param name="news.project.xml" select="$news.project.xml" />
+			    <xsl:with-param name="news.project.xml-master" select="$news.project.xml-master" />
+			    <xsl:with-param name="news.project.xml" select="$news.project.xml" />
 			</xsl:call-template>
 
 			  <div>
@@ -220,8 +221,8 @@
 			<div class="newseventswrap">
 
 			<xsl:call-template name="html-index-events-items">
-				<xsl:with-param name="events.xml" select="$events.xml" />
-				<xsl:with-param name="curdate.xml" select="$curdate.xml" />
+			    <xsl:with-param name="events.xml-master" select="$events.xml-master" />
+			    <xsl:with-param name="events.xml" select="$events.xml" />
 			</xsl:call-template>
 
 			  <div>
@@ -243,7 +244,8 @@
 			<div class="newseventswrap">
 
 			<xsl:call-template name="html-index-news-press-items">
-				<xsl:with-param name="news.press.xml" select="$news.press.xml" />
+			    <xsl:with-param name="news.press.xml-master" select="$news.press.xml-master" />
+			    <xsl:with-param name="news.press.xml" select="$news.press.xml" />
 			</xsl:call-template>
 
 			  <div>