diff --git a/dist/buildmk b/dist/buildmk
index ae415762..2fe14ccf 100755
--- a/dist/buildmk
+++ b/dist/buildmk
@@ -7,11 +7,12 @@ OBJTYPE=`uname -p | sed '
 	s;i86pc;386;;
 	s;amd64;x86_64;;
 	s;/.*;;; s; ;;g;
-	s;armv4l;arm;g;
+	s;armv.*;arm;g;
 	s;powerpc;power;g;
+	s;PowerMacintosh;power;g;
 	s;macppc;power;g;
 	s;ppc64;power;g;
 	s;ppc;power;g;
-	'` export OBJTYPE
+'` export OBJTYPE
 sh -x mkmk.sh
 
diff --git a/src/mkhdr b/src/mkhdr
index 8c452f42..1fc37ebd 100644
--- a/src/mkhdr
+++ b/src/mkhdr
@@ -1,16 +1,17 @@
+# if you change this, also edit ../dist/buildmk
 SYSNAME=`uname`
-# objtype rules also in Makefile
-OBJTYPE=`uname -m | sed '
+OBJTYPE=`uname -p | sed '
 	s;i.86;386;;
 	s;i86pc;386;;
 	s;amd64;x86_64;;
-	s;/.*;;;
-	s; ;;g;
+	s;/.*;;; s; ;;g;
 	s;armv.*;arm;g;
+	s;powerpc;power;g;
 	s;PowerMacintosh;power;g;
 	s;macppc;power;g;
 	s;ppc64;power;g;
-	s;ppc;power;g'`
+	s;ppc;power;g;
+'`
 
 BIN=$PLAN9/bin
 LIBDIR=$PLAN9/lib