diff --git a/Makefile b/Makefile
index 36b8168411..2867535ffb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,62 +1,14 @@
-# $FreeBSD: www/Makefile,v 1.14 2000/09/30 00:21:38 nbm Exp $
+# $FreeBSD: www/Makefile,v 1.15 2000/11/08 01:15:39 kuriyama Exp $
 
 WEB_PREFIX=	${.CURDIR}
 
-LINKS=	en/ja en/es en/ru en/zh
-LINKS+=	ja/web.mk es/web.mk ru/web.mk
-LINKS+=	web.mk
-
-.if !defined(WEB_ONLY) || empty(WEB_ONLY)
-LINKS+= ../doc/en_US.ISO_8859-1/web.mk
-LINKS+= ../doc/en_US.ISO_8859-1/includes.sgml
-.endif
-
 SUBDIR= en
 
 .if make(obj)
 SUBDIR+= ja es ru zh
 .endif
 
-all: links
-
-
-links: ${LINKS}
-
-clean:
-	rm -f ${LINKS}
-
-
-en/ja:
-	cd en; ln -sf ${.CURDIR}/ja
-
-en/es:
-	cd en; ln -sf ${.CURDIR}/es
-
-en/ru:
-	cd en; ln -sf ${.CURDIR}/ru
-
-en/zh:
-	cd en; ln -sf ${.CURDIR}/zh
-
-ja/web.mk:
-	cd ja; ln -sf ${.CURDIR}/en/web.mk
-
-es/web.mk:
-	cd es; ln -sf ${.CURDIR}/en/web.mk
-
-ru/web.mk:
-	cd ru; ln -sf ${.CURDIR}/en/web.mk
-
-web.mk:
-	cd .;  ln -sf ${.CURDIR}/en/web.mk
-
-.if !defined(WEB_ONLY) || empty(WEB_ONLY)
-../doc/en_US.ISO_8859-1/web.mk:
-	cd ../doc/en_US.ISO_8859-1; ln -sf ${.CURDIR}/en/web.mk
-
-../doc/en_US.ISO_8859-1/includes.sgml:
-	cd ../doc/en_US.ISO_8859-1; ln -sf ${.CURDIR}/en/includes.sgml
-.endif
+links:
 
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>
diff --git a/en/Makefile b/en/Makefile
index ed90efe964..031c2f34dc 100644
--- a/en/Makefile
+++ b/en/Makefile
@@ -1,79 +1,78 @@
-# $FreeBSD: www/en/Makefile,v 1.55 2000/11/07 07:37:55 kuriyama Exp $
+# $FreeBSD: www/en/Makefile,v 1.56 2000/11/24 22:55:39 murray Exp $
 .if exists(Makefile.conf)
 .include "Makefile.conf"
 .endif
 .if exists(../Makefile.inc)
 .include "../Makefile.inc"
 .endif
 
 # These are turned into validated, normalized HTML files.
 
 DOCS=  applications.sgml
 DOCS+= auditors.sgml
 DOCS+= availability.sgml
 DOCS+= docs.sgml 
 DOCS+= features.sgml
 DOCS+= register.sgml
 DOCS+= index.sgml
 DOCS+= internet.sgml 
 DOCS+= mailto.sgml 
 DOCS+= publish.sgml
 DOCS+= send-pr.sgml
 DOCS+= support.sgml
 DOCS+= where.sgml 
 DOCS+= y2kbug.sgml 
 
 CLEANFILES+=atoz.sgml site.sgml
 
 # These will be directly installed.
 
 #DATA=	COPYING COPYING.LIB README.mirror robots.txt index.html
 DATA=	robots.txt index.html
 
 # Subdirectories
 # SGML
 SUBDIR=	 security
 SUBDIR+= commercial
 SUBDIR+= docproj
 SUBDIR+= news
 SUBDIR+= alpha
 SUBDIR+= internal
 SUBDIR+= java
 SUBDIR+= copyright
 SUBDIR+= search
 SUBDIR+= gallery
 SUBDIR+= projects
 SUBDIR+= platforms
 SUBDIR+= releases 
 SUBDIR+= smp
 SUBDIR+= conspectus
 .if !defined(WEB_ONLY) || empty(WEB_ONLY)
 SUBDIR+= ports
 .endif
 
 # Non-SGML
 SUBDIR+= gifs
 SUBDIR+= cgi
 
 WEB_LANG?=	ja es ru zh
 
 # Non-English
 
 .if !defined(ENGLISH_ONLY) || empty(ENGLISH_ONLY)
 .for DIR in ${WEB_LANG}
-#SUBDIR+=	../${DIR}
-SUBDIR+=	${DIR}
+SUBDIR+=	../${DIR}
 .endfor
 .endif
 
 .if !defined(WEB_ONLY) || empty(WEB_ONLY)
 # Extern
 SUBDIR+= tutorials
 
 DOCSUBDIR=	FAQ handbook
 .endif
 SGMLOPTS+=      -links -hdr ${.CURDIR}/doc.hdr -ftr ${.CURDIR}/doc.ftr
 
 WEBDIR=		data
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"