diff --git a/mach/proto/as/build.mk b/mach/proto/as/build.mk
index 791611f3d..a67277ac2 100644
--- a/mach/proto/as/build.mk
+++ b/mach/proto/as/build.mk
@@ -41,6 +41,10 @@ $(OBJDIR)/$D/preprocessed-comm2.y: mach/proto/as/comm2.y $(CPPANSI) \
 	$(call file, $(LIBOBJECT))
     $(call cprogram, $(BINDIR)/$(PLATFORM)/as)
     $(call installto, $(PLATDEP)/$(PLATFORM)/as)
+
+    $(call reset)
+    $(call file, man/$(ARCH)_as.6)
+    $(call installto, $(INSDIR)/share/man/man6/$(ARCH)_as.6)
 endef
 
 build-as = $(eval $(build-as-impl))
diff --git a/man/.distr b/man/.distr
index d21bfd287..f3262226b 100644
--- a/man/.distr
+++ b/man/.distr
@@ -2,12 +2,13 @@
 6800_as.6
 6805_as.6
 6809_as.6
-8080_as.6
+i80_as.6
 z8000_as.6
 i86_as.6
 i386_as.6
-m68k2_as.6
+m68020_as.6
 ns_as.6
+vc4_as.6
 pdp_as.6
 z80_as.6
 em_cg.6
diff --git a/man/8080_as.6 b/man/i80_as.6
similarity index 100%
rename from man/8080_as.6
rename to man/i80_as.6
diff --git a/man/m68k2_as.6 b/man/m68020_as.6
similarity index 100%
rename from man/m68k2_as.6
rename to man/m68020_as.6