diff --git a/de/Makefile b/de/Makefile
index 0ba71c392f..e750b8fdb7 100644
--- a/de/Makefile
+++ b/de/Makefile
@@ -1,6 +1,6 @@
 # The FreeBSD Documentation Project
 # The FreeBSD German Documentation Project
-# $FreeBSD: www/de/Makefile,v 1.13 2004/01/11 00:32:03 mheinen Exp $
+# $FreeBSD: www/de/Makefile,v 1.14 2004/04/05 14:17:52 phantom Exp $
 # $FreeBSDde: de-www/Makefile,v 1.21 2004/01/05 11:08:11 mheinen Exp $
 # basiert auf: 1.105
 
@@ -44,17 +44,11 @@ SUBDIR+= doc
 SUBDIR+= relnotes
 .endif
 
-# These *must* be listed after the "doc" subdir, as they create symlinks
-# in to it.
-#.if !defined(WEB_ONLY) || empty(WEB_ONLY)
 #SUBDIR+= tutorials
-#.endif
 
 # Non-SGML
 SUBDIR+= gifs
 
-COOKIE=	FAQ handbook
-
 WEBDIR?=	data/de
 
 # index.html is special, and generated from index.xsl and news/news.xml
diff --git a/en/Makefile b/en/Makefile
index 2597304b14..8b7e48f2f3 100644
--- a/en/Makefile
+++ b/en/Makefile
@@ -1,4 +1,5 @@
-# $FreeBSD: www/en/Makefile,v 1.107 2004/02/01 00:02:58 josef Exp $
+# $FreeBSD: www/en/Makefile,v 1.108 2004/04/05 14:21:26 phantom Exp $
+
 .if exists(Makefile.conf)
 .include "Makefile.conf"
 .endif
@@ -41,6 +42,7 @@ SUBDIR+= advocacy
 SUBDIR+= events
 SUBDIR+= FAQ
 SUBDIR+= handbook
+SUBDIR+= tutorials
 SUBDIR+= internal
 SUBDIR+= java
 SUBDIR+= copyright
@@ -63,20 +65,12 @@ SUBDIR+= doc
 SUBDIR+= relnotes
 .endif
 
-# These *must* be listed after the "doc" subdir, as they create symlinks
-# in to it.
-.if !defined(WEB_ONLY) || empty(WEB_ONLY)
-SUBDIR+= tutorials
-.endif
-
 # Non-SGML
 SUBDIR+= gifs
 SUBDIR+= cgi
 
 WEB_LANG?=	da de es fr it ja pt_BR ru tr zh
 
-COOKIE=	FAQ handbook
-
 # Non-English
 
 .if !defined(ENGLISH_ONLY) || empty(ENGLISH_ONLY)
diff --git a/fr/Makefile b/fr/Makefile
index 23990c090e..26158a3876 100644
--- a/fr/Makefile
+++ b/fr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/fr/Makefile,v 1.4 2004/03/06 17:33:18 stephane Exp $
+# $FreeBSD: www/fr/Makefile,v 1.5 2004/04/05 14:17:52 phantom Exp $
 
 # The FreeBSD French Documentation Project
 # Original revision: 1.107
@@ -45,6 +45,7 @@ SUBDIR+= advocacy
 SUBDIR+= events
 SUBDIR+= FAQ
 SUBDIR+= handbook
+SUBDIR+= tutorials
 SUBDIR+= internal
 SUBDIR+= java
 SUBDIR+= copyright
@@ -67,20 +68,12 @@ SUBDIR+= doc
 SUBDIR+= relnotes
 .endif
 
-# These *must* be listed after the "doc" subdir, as they create symlinks
-# in to it.
-.if !defined(WEB_ONLY) || empty(WEB_ONLY)
-SUBDIR+= tutorials
-.endif
-
 # Non-SGML
 # SUBDIR+= gifs
 # SUBDIR+= cgi
 
 # WEB_LANG?=	da de es fr it ja pt_BR ru tr zh
 
-COOKIE=	FAQ handbook
-
 # Non-English
 
 # .if !defined(ENGLISH_ONLY) || empty(ENGLISH_ONLY)
diff --git a/pt_BR/Makefile b/pt_BR/Makefile
index 359f09e334..3f34d100a4 100644
--- a/pt_BR/Makefile
+++ b/pt_BR/Makefile
@@ -3,7 +3,7 @@
 #
 # Based on: 1.105
 #
-# $FreeBSD: www/pt_BR/Makefile,v 1.1 2002/10/05 16:05:33 lioux Exp $
+# $FreeBSD: www/pt_BR/Makefile,v 1.2 2004/01/05 03:02:25 lioux Exp $
 
 .if exists(Makefile.conf)
 .include "Makefile.conf"
@@ -20,8 +20,6 @@ SUBDIR+= FAQ
 SUBDIR+=	doc
 .endif
 
-COOKIE=	FAQ
-
 WEBDIR?=	data/pt_BR
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/ru/Makefile b/ru/Makefile
index e99d3a6ab8..6e616b6c7c 100644
--- a/ru/Makefile
+++ b/ru/Makefile
@@ -1,7 +1,7 @@
 #
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD: www/ru/Makefile,v 1.34 2004/03/23 23:27:57 phantom Exp $
+# $FreeBSD: www/ru/Makefile,v 1.35 2004/04/05 14:17:52 phantom Exp $
 # $FreeBSDru: frdp/www/ru/Makefile,v 1.34 2004/02/11 12:17:39 den Exp $
 #
 # Original revision: 1.107
@@ -43,6 +43,7 @@ SUBDIR+= news
 #SUBDIR+= events
 SUBDIR+= FAQ
 SUBDIR+= handbook
+SUBDIR+= tutorials
 SUBDIR+= internal
 SUBDIR+= java
 SUBDIR+= copyright
@@ -65,18 +66,10 @@ SUBDIR+= doc
 #SUBDIR+= relnotes
 .endif
 
-# These *must* be listed after the "doc" subdir, as they create symlinks
-# in to it.
-.if !defined(WEB_ONLY) || empty(WEB_ONLY)
-SUBDIR+= tutorials
-.endif
-
 # Non-SGML
 #SUBDIR+= gifs
 #SUBDIR+= cgi
 
-COOKIE=		FAQ handbook
-
 WEBDIR?=	data/ru
 
 # index.html is special, and generated from index.xsl and news/news.xml