4 files changed, 9 insertions, 17 deletions
diff --git a/src/cmd/upas/ml/mkfile b/src/cmd/upas/ml/mkfile
index 5142e56f..1a384108 100644
--- a/src/cmd/upas/ml/mkfile
+++ b/src/cmd/upas/ml/mkfile
@@ -1,4 +1,4 @@
-</$objtype/mkfile
+<$PLAN9/src/mkhdr
 
 TARG=ml\
 	mlowner\
@@ -16,25 +16,17 @@ UHFILES= ../common/common.h\
 HFILES=$UHFILES\
 	../smtp/y.tab.h\
 
-LIB=../common/libcommon.a$O\
+LIB=../common/libcommon.a
 
-BIN=/$objtype/bin/upas
-
-UPDATE=\
-	mkfile\
-	$UHFILES\
-	${TARG:%=%.c}\
-	${OFILES:%.$O=%.c}\
-	../smtp/rfc822.y\
-
-</sys/src/cmd/mkmany
+BIN=$BIN/upas
+<$PLAN9/src/mkmany
 CFLAGS=$CFLAGS -I../common
 
 $O.ml: ../smtp/rfc822.tab.$O
 $O.mlowner: ../smtp/rfc822.tab.$O
 
 ../smtp/y.tab.h ../smtp/rfc822.tab.$O:
-	@{
+	(
 		cd ../smtp
 		mk rfc822.tab.$O
-	}
+	)
diff --git a/src/cmd/upas/ml/ml.c b/src/cmd/upas/ml/ml.c
index 8372dc9d..8dad0517 100644
--- a/src/cmd/upas/ml/ml.c
+++ b/src/cmd/upas/ml/ml.c
@@ -35,7 +35,7 @@ main(int argc, char **argv)
 		break;
 	}ARGEND;
 
-	rfork(RFENVG|RFREND);
+	rfork(RFENVG);
 
 	if(argc < 2)
 		usage();
diff --git a/src/cmd/upas/ml/mlmgr.c b/src/cmd/upas/ml/mlmgr.c
index a1d1b907..758fc0a1 100644
--- a/src/cmd/upas/ml/mlmgr.c
+++ b/src/cmd/upas/ml/mlmgr.c
@@ -21,7 +21,7 @@ main(int argc, char **argv)
 	char *listname, *addr;
 	String *owner, *alfile;
 
-	rfork(RFENVG|RFREND);
+	rfork(RFENVG);
 
 	ARGBEGIN{
 	case 'c':
diff --git a/src/cmd/upas/ml/mlowner.c b/src/cmd/upas/ml/mlowner.c
index 5bb98a29..4ac46b86 100644
--- a/src/cmd/upas/ml/mlowner.c
+++ b/src/cmd/upas/ml/mlowner.c
@@ -24,7 +24,7 @@ main(int argc, char **argv)
 	ARGBEGIN{
 	}ARGEND;
 
-	rfork(RFENVG|RFREND);
+	rfork(RFENVG);
 
 	if(argc < 2)
 		usage();