diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index c513d261662f..d15a2b8c6a56 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -1,4 +1,4 @@
-#	$Id: bsd.dep.mk,v 1.17 1998/02/20 14:32:30 bde Exp $
+#	$Id: bsd.dep.mk,v 1.18 1998/03/07 13:57:37 bde Exp $
 #
 # The include file <bsd.dep.mk> handles Makefile dependencies.
 #
@@ -80,18 +80,18 @@ tags:
 
 .if !target(tags)
 tags: ${SRCS} _SUBDIR
-	@cd ${.CURDIR} && gtags ${GTAGSFLAGS}
+	@cd ${.CURDIR} && gtags ${GTAGSFLAGS} ${.OBJDIR}
 .if defined(HTML)
-	@cd ${.CURDIR} && htags ${HTAGSFLAGS}
+	@cd ${.CURDIR} && htags ${HTAGSFLAGS} -d ${.OBJDIR} ${.OBJDIR}
 .endif
 .endif
 
 .if !target(cleandepend)
 cleandepend: _SUBDIR
 .if defined(SRCS)
-	rm -f ${DEPENDFILE} ${.CURDIR}/GRTAGS ${.CURDIR}/GSYMS ${.CURDIR}/GTAGS
+	rm -f ${DEPENDFILE} ${.OBJDIR}/GRTAGS ${.OBJDIR}/GSYMS ${.OBJDIR}/GTAGS
 .if defined(HTML)
-	rm -rf ${.CURDIR}/HTML
+	rm -rf ${.OBJDIR}/HTML
 .endif
 .endif
 .endif
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 5060a3f6bf9e..7801f01c9ea5 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-#	$Id: bsd.prog.mk,v 1.65 1998/03/06 07:28:01 bde Exp $
+#	$Id: bsd.prog.mk,v 1.66 1998/03/12 20:02:15 eivind Exp $
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
@@ -131,9 +131,9 @@ tags:
 .if !target(tags)
 tags: ${SRCS} _SUBDIR
 .if defined(PROG)
-	@cd ${.CURDIR} && gtags ${GTAGSFLAGS}
+	@cd ${.CURDIR} && gtags ${GTAGSFLAGS} ${.OBJDIR}
 .if defined(HTML)
-	@cd ${.CURDIR} && htags ${HTAGSFLAGS}
+	@cd ${.CURDIR} && htags ${HTAGSFLAGS} -d ${.OBJDIR} ${.OBJDIR}
 .endif
 .endif
 .endif
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index 43d0f58c0c0a..9f497342a331 100644
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.subdir.mk	5.9 (Berkeley) 2/1/91
-#	$Id: bsd.subdir.mk,v 1.19 1997/11/15 13:09:52 wosch Exp $
+#	$Id: bsd.subdir.mk,v 1.20 1998/03/12 20:02:17 eivind Exp $
 #
 # The include file <bsd.subdir.mk> contains the default targets
 # for building subdirectories. It has the same seven targets
@@ -67,9 +67,9 @@ ${__target}: _SUBDIRUSE
 .if !target(tags)
 .if defined(TAGS)
 tags:
-	@cd ${.CURDIR} && gtags ${GTAGSFLAGS}
+	@cd ${.CURDIR} && gtags ${GTAGSFLAGS} ${.OBJDIR}
 .if defined(HTML)
-	@cd ${.CURDIR} && htags ${HTAGSFLAGS}
+	@cd ${.CURDIR} && htags ${HTAGSFLAGS} -d ${.OBJDIR} ${.OBJDIR}
 .endif
 .else
 tags:	_SUBDIRUSE
@@ -79,9 +79,9 @@ tags:	_SUBDIRUSE
 .if !defined(cleandepend)
 cleandepend:	_SUBDIRUSE
 .if defined(TAGS)
-	@rm -f ${.CURDIR}/GTAGS ${.CURDIR}/GRTAGS
+	@rm -f ${.OBJDIR}/GTAGS ${.OBJDIR}/GRTAGS ${.OBJDIR}/GSYMS
 .if defined(HTML)
-	@rm -rf ${.CURDIR}/HTML
+	@rm -rf ${.OBJDIR}/HTML
 .endif
 .endif
 .endif
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 3d568e2676a2..5c3eb6aeb220 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,5 +1,5 @@
 #	from: @(#)sys.mk	8.2 (Berkeley) 3/21/94
-#	$Id: sys.mk,v 1.28 1998/01/21 01:03:51 jb Exp $
+#	$Id: sys.mk,v 1.29 1998/02/20 15:27:03 bde Exp $
 
 unix		?=	We run FreeBSD, not UNIX.
 
@@ -109,7 +109,7 @@ BINFORMAT	?=	aout
 .endif
 
 # For tags rule.
-GTAGSFLAGS=
+GTAGSFLAGS=	-o
 HTAGSFLAGS=
 
 .if defined(%POSIX)