diff --git a/lib/libtcl/Makefile b/lib/libtcl/Makefile
index 5458a76a434e..7b8daaaccbae 100644
--- a/lib/libtcl/Makefile
+++ b/lib/libtcl/Makefile
@@ -5,7 +5,7 @@
 # Please change src/tools/tools/tcl_bmake/mkMakefile.sh instead
 #
 # Generated by src/tools/tools/tcl_bmake/mkMakefile.sh version:
-# Id: mkMakefile.sh,v 1.10 1996/09/05 19:19:18 peter Exp 
+# Id: mkMakefile.sh,v 1.11 1996/09/18 14:27:44 phk Exp 
 #
 
 TCLDIST=${.CURDIR}/../../contrib/tcl
@@ -220,181 +220,236 @@ MLINKS+= Tcl_UpVar.3 Tcl_UpVar2.3
 
 # Ugly, I know, but what else can I do?!?
 
-
+CLEANFILES+=	Tcl_AddErrorInfo.3
 Tcl_AddErrorInfo.3: ${TCLDIST}/doc/AddErrInfo.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_Alloc.3
 Tcl_Alloc.3: ${TCLDIST}/doc/Alloc.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_AllowExceptions.3
 Tcl_AllowExceptions.3: ${TCLDIST}/doc/AllowExc.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_AppInit.3
 Tcl_AppInit.3: ${TCLDIST}/doc/AppInit.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_GetAssocData.3
 Tcl_GetAssocData.3: ${TCLDIST}/doc/AssocData.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_AsyncCreate.3
 Tcl_AsyncCreate.3: ${TCLDIST}/doc/Async.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_BackgroundError.3
 Tcl_BackgroundError.3: ${TCLDIST}/doc/BackgdErr.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_Backslash.3
 Tcl_Backslash.3: ${TCLDIST}/doc/Backslash.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_CallWhenDeleted.3
 Tcl_CallWhenDeleted.3: ${TCLDIST}/doc/CallDel.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_CommandComplete.3
 Tcl_CommandComplete.3: ${TCLDIST}/doc/CmdCmplt.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_Concat.3
 Tcl_Concat.3: ${TCLDIST}/doc/Concat.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_CreateChannel.3
 Tcl_CreateChannel.3: ${TCLDIST}/doc/CrtChannel.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_CreateChannelHandler.3
 Tcl_CreateChannelHandler.3: ${TCLDIST}/doc/CrtChnlHdlr.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_CreateCloseHandler.3
 Tcl_CreateCloseHandler.3: ${TCLDIST}/doc/CrtCloseHdlr.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_CreateCommand.3
 Tcl_CreateCommand.3: ${TCLDIST}/doc/CrtCommand.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_CreateFileHandler.3
 Tcl_CreateFileHandler.3: ${TCLDIST}/doc/CrtFileHdlr.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_CreateInterp.3
 Tcl_CreateInterp.3: ${TCLDIST}/doc/CrtInterp.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_CreateMathFunc.3
 Tcl_CreateMathFunc.3: ${TCLDIST}/doc/CrtMathFnc.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_CreateModalTimeout.3
 Tcl_CreateModalTimeout.3: ${TCLDIST}/doc/CrtModalTmt.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_IsSafe.3
 Tcl_IsSafe.3: ${TCLDIST}/doc/CrtSlave.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_CreateTimerHandler.3
 Tcl_CreateTimerHandler.3: ${TCLDIST}/doc/CrtTimerHdlr.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_CreateTrace.3
 Tcl_CreateTrace.3: ${TCLDIST}/doc/CrtTrace.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_DStringInit.3
 Tcl_DStringInit.3: ${TCLDIST}/doc/DString.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_DetachPids.3
 Tcl_DetachPids.3: ${TCLDIST}/doc/DetachPids.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_DoOneEvent.3
 Tcl_DoOneEvent.3: ${TCLDIST}/doc/DoOneEvent.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_DoWhenIdle.3
 Tcl_DoWhenIdle.3: ${TCLDIST}/doc/DoWhenIdle.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_Eval.3
 Tcl_Eval.3: ${TCLDIST}/doc/Eval.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_Exit.3
 Tcl_Exit.3: ${TCLDIST}/doc/Exit.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_ExprLong.3
 Tcl_ExprLong.3: ${TCLDIST}/doc/ExprLong.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_FindExecutable.3
 Tcl_FindExecutable.3: ${TCLDIST}/doc/FindExec.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_GetFile.3
 Tcl_GetFile.3: ${TCLDIST}/doc/GetFile.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_GetInt.3
 Tcl_GetInt.3: ${TCLDIST}/doc/GetInt.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_GetOpenFile.3
 Tcl_GetOpenFile.3: ${TCLDIST}/doc/GetOpnFl.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_GetStdChannel.3
 Tcl_GetStdChannel.3: ${TCLDIST}/doc/GetStdChan.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_InitHashTable.3
 Tcl_InitHashTable.3: ${TCLDIST}/doc/Hash.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_Interp.3
 Tcl_Interp.3: ${TCLDIST}/doc/Interp.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_LinkVar.3
 Tcl_LinkVar.3: ${TCLDIST}/doc/LinkVar.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_CreateEventSource.3
 Tcl_CreateEventSource.3: ${TCLDIST}/doc/Notifier.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_OpenFileChannel.3
 Tcl_OpenFileChannel.3: ${TCLDIST}/doc/OpenFileChnl.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_OpenTcpClient.3
 Tcl_OpenTcpClient.3: ${TCLDIST}/doc/OpenTcp.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_PkgRequire.3
 Tcl_PkgRequire.3: ${TCLDIST}/doc/PkgRequire.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_Preserve.3
 Tcl_Preserve.3: ${TCLDIST}/doc/Preserve.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_PrintDouble.3
 Tcl_PrintDouble.3: ${TCLDIST}/doc/PrintDbl.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_RecordAndEval.3
 Tcl_RecordAndEval.3: ${TCLDIST}/doc/RecordEval.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_RegExpMatch.3
 Tcl_RegExpMatch.3: ${TCLDIST}/doc/RegExp.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_SetErrno.3
 Tcl_SetErrno.3: ${TCLDIST}/doc/SetErrno.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_SetRecursionLimit.3
 Tcl_SetRecursionLimit.3: ${TCLDIST}/doc/SetRecLmt.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_SetResult.3
 Tcl_SetResult.3: ${TCLDIST}/doc/SetResult.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_SetVar.3
 Tcl_SetVar.3: ${TCLDIST}/doc/SetVar.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_Sleep.3
 Tcl_Sleep.3: ${TCLDIST}/doc/Sleep.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_SplitList.3
 Tcl_SplitList.3: ${TCLDIST}/doc/SplitList.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_SplitPath.3
 Tcl_SplitPath.3: ${TCLDIST}/doc/SplitPath.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_StaticPackage.3
 Tcl_StaticPackage.3: ${TCLDIST}/doc/StaticPkg.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_StringMatch.3
 Tcl_StringMatch.3: ${TCLDIST}/doc/StrMatch.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_Main.3
 Tcl_Main.3: ${TCLDIST}/doc/Tcl_Main.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_TraceVar.3
 Tcl_TraceVar.3: ${TCLDIST}/doc/TraceVar.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_TranslateFileName.3
 Tcl_TranslateFileName.3: ${TCLDIST}/doc/Translate.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
+CLEANFILES+=	Tcl_UpVar.3
 Tcl_UpVar.3: ${TCLDIST}/doc/UpVar.3
 	ln -s ${.ALLSRC} ${.TARGET}
 
-
 .include <bsd.lib.mk>
-
diff --git a/tools/tools/tcl_bmake/mkMakefile.sh b/tools/tools/tcl_bmake/mkMakefile.sh
index bb3b898e2ebe..3715947bfca3 100644
--- a/tools/tools/tcl_bmake/mkMakefile.sh
+++ b/tools/tools/tcl_bmake/mkMakefile.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: mkMakefile.sh,v 1.10 1996/09/05 19:19:18 peter Exp $
+# $Id: mkMakefile.sh,v 1.11 1996/09/18 14:27:44 phk Exp $
 #
 # This script generates a bmake Makefile for src/lib/libtcl
 #
@@ -40,7 +40,7 @@ echo '#
 # Please change src/tools/tools/tcl_bmake/mkMakefile.sh instead
 #
 # Generated by src/tools/tools/tcl_bmake/mkMakefile.sh version:
-# $Id: mkMakefile.sh,v 1.10 1996/09/05 19:19:18 peter Exp $
+# $Id: mkMakefile.sh,v 1.11 1996/09/18 14:27:44 phk Exp $
 #
 ' | tr -d '$' >> ${LIBTCL}Makefile
 
@@ -166,8 +166,7 @@ do
 done
 
 echo '
-# Ugly, I know, but what else can I do?!?
-' >> ${LIBTCL}Makefile
+# Ugly, I know, but what else can I do?!?' >> ${LIBTCL}Makefile
 
 for i in ${SRCDIR}/doc/*.3
 do
@@ -180,6 +179,7 @@ do
 	' | awk '
 		{
 		print ""
+		print "CLEANFILES+=\t" $1 ".3"
 		print $1 ".3: ${TCLDIST}/doc/" B  ".3"
 		print "\tln -s \${.ALLSRC} \${.TARGET}"
 		}
@@ -187,12 +187,8 @@ do
 done
 
 echo '
-
-.include <bsd.lib.mk>
-' >> ${LIBTCL}Makefile
+.include <bsd.lib.mk>' >> ${LIBTCL}Makefile
 
 sed -e '/^TCL.*_LIB_SPEC=/s/-L.* //' < ${SRCDIR}/unix/tclConfig.sh > ${LIBTCL}/tclConfig.sh
 
 rm -f m.x ${SRCDIR}/unix/config.log ${SRCDIR}/unix/Makefile ${SRCDIR}/unix/config.cache ${SRCDIR}/unix/config.status ${SRCDIR}/unix/tclConfig.sh
-
-