diff --git a/.distr b/.distr
index 139840f92..a79c62e38 100644
--- a/.distr
+++ b/.distr
@@ -1,21 +1,73 @@
-Action
-Copyright
-NEW
 README
-TODO
-TakeAction
-bin
-doc
-emtest
-etc
-fast
-fcc
-first
+Copyright
+pm
+pmfile
+config.pm
+
 h
-include
-modules
-lang
-lib
-mach
-man
-util
+modules/h
+
+first
+util/data
+util/LLgen
+
+modules/src/alloc
+modules/src/assert
+modules/src/system
+modules/src/string
+modules/src/read_em
+modules/src/em_code
+modules/src/em_mes
+modules/src/print
+modules/src/object
+modules/src/idf
+modules/src/input
+modules/src/flt_arith
+
+util/amisc
+util/cmisc
+util/ack
+lib/descr/fe
+util/arch
+util/cpp
+util/cgg
+util/ncgg
+util/misc
+util/opt
+util/ego
+util/topgen
+util/led
+
+lang/cem
+lang/pc
+lang/m2
+lang/occam
+lang/basic
+
+mach/proto
+mach/i86
+
+plat/pc86
+
+examples
+
+#Action
+#NEW
+#README
+#TODO
+#TakeAction
+#bin
+#doc
+#emtest
+#etc
+#fast
+#fcc
+#first
+#h
+#include
+#modules
+#lang
+#lib
+#mach
+#man
+#util
diff --git a/first/.distr b/first/.distr
index ed9c6a4ef..8bff7f59c 100644
--- a/first/.distr
+++ b/first/.distr
@@ -1,18 +1,24 @@
-create_dir
-cp_dir
-em_path.h.src
-first
-get_answer
-get_makepars
-get_sys
-get_sysvax
-install_tail
-limit_enquire
-limit_impl
-lint_params
-local.h.src
-mk_config
-mk_makefile
-mk_target
-target_comp
-util_comp
+ack.pm
+ack-custom.pm
+c.pm
+llgen.pm
+yacc.pm
+
+#create_dir
+#cp_dir
+#em_path.h.src
+#first
+#get_answer
+#get_makepars
+#get_sys
+#get_sysvax
+#install_tail
+#limit_enquire
+#limit_impl
+#lint_params
+#local.h.src
+#mk_config
+#mk_makefile
+#mk_target
+#target_comp
+#util_comp
diff --git a/h/.distr b/h/.distr
index 1aa187a40..7ab9a7094 100644
--- a/h/.distr
+++ b/h/.distr
@@ -1,19 +1,19 @@
-Makefile
+#Makefile
 arch.h
 bc_io.h
 bc_string.h
-as_spec.h
+#as_spec.h
 cg_pattern.h
 cgg_cg.h
 em_abs.h
 em_ego.h
 em_flag.h
 em_mes.h
-em_mnem.h
-em_pseu.h
+#em_mnem.h
+#em_pseu.h
 em_ptyp.h
 em_reg.h
-em_spec.h
+#em_spec.h
 out.h
 stb.h
 pc_err.h
@@ -24,4 +24,6 @@ ocm_chan.h
 ocm_parco.h
 ocm_proc.h
 m2_traps.h
-ip_spec.h
+#ip_spec.h
+em_table
+con_float
diff --git a/include/_tail_mon/sys/timeb.h b/include/_tail_mon/sys/timeb.h
deleted file mode 100644
index d4560b199..000000000
--- a/include/_tail_mon/sys/timeb.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* $Id$ */
-/*
- * (c) copyright 1987 by the Vrije Universiteit, Amsterdam, The Netherlands.
- * See the copyright notice in the ACK home directory, in the file "Copyright".
- */
-struct timeb {
-	time_t	time;
-	u_short	millitm;
-	short	timezone;
-	short	dstflag;
-};
diff --git a/lang/basic/.distr b/lang/basic/.distr
index bb678e21e..8b025617a 100644
--- a/lang/basic/.distr
+++ b/lang/basic/.distr
@@ -1,3 +1,3 @@
-lib
+pmfile
 src
-test
+lib
diff --git a/lang/basic/lib/.distr b/lang/basic/lib/.distr
index 7d4ded32e..4e51a9787 100644
--- a/lang/basic/lib/.distr
+++ b/lang/basic/lib/.distr
@@ -1,2 +1,34 @@
-LIST
-tail_bc.a
+pmfile
+abs.c
+asc.c
+asrt.c
+atn.c
+chr.c
+conversion.c
+hlt.c
+mki.c
+oct.c
+peek.c
+power.c
+exp.c
+log.c
+print.c
+io.c
+random.c
+read.c
+return.c
+sgn.c
+sin.c
+fif.e
+sqt.c
+fef.e
+stop.c
+string.c
+salloc.c
+swap.c
+trace.c
+write.c
+file.c
+error.c
+trap.c
+setline.e
diff --git a/lang/basic/src/.distr b/lang/basic/src/.distr
index 5c7feb21a..053feca94 100644
--- a/lang/basic/src/.distr
+++ b/lang/basic/src/.distr
@@ -1,5 +1,4 @@
-proto.make
-proto.main
+pmfile
 basic.g
 basic.lex
 bem.c
diff --git a/lang/cem/.distr b/lang/cem/.distr
index 5ffc8f560..abc892c53 100644
--- a/lang/cem/.distr
+++ b/lang/cem/.distr
@@ -1,7 +1,6 @@
+pmfile
 cemcom.ansi
 cpp.ansi
 libcc.ansi
 cemcom
-ctest
 libcc
-lint
diff --git a/lang/cem/cemcom.ansi/.distr b/lang/cem/cemcom.ansi/.distr
index ba9bb3675..2ea332861 100644
--- a/lang/cem/cemcom.ansi/.distr
+++ b/lang/cem/cemcom.ansi/.distr
@@ -1,5 +1,4 @@
-proto.make
-proto.main
+pmfile
 LLlex.c
 LLlex.h
 LLmessage.c
diff --git a/lang/cem/cemcom/.distr b/lang/cem/cemcom/.distr
index 3a5a222af..eee6d8f13 100644
--- a/lang/cem/cemcom/.distr
+++ b/lang/cem/cemcom/.distr
@@ -1,5 +1,4 @@
-proto.make
-proto.main
+pmfile
 LLlex.c
 LLlex.h
 LLmessage.c
diff --git a/lang/cem/cpp.ansi/.distr b/lang/cem/cpp.ansi/.distr
index 004074cd3..28ed84cb2 100644
--- a/lang/cem/cpp.ansi/.distr
+++ b/lang/cem/cpp.ansi/.distr
@@ -1,8 +1,7 @@
+pmfile
 LLlex.c
 LLlex.h
 LLmessage.c
-proto.main
-proto.make
 Parameters
 arith.h
 bits.h
diff --git a/lang/cem/libcc.ansi/.distr b/lang/cem/libcc.ansi/.distr
index 29afe426d..65f515e93 100644
--- a/lang/cem/libcc.ansi/.distr
+++ b/lang/cem/libcc.ansi/.distr
@@ -1,13 +1,12 @@
-LIST
+pmfile
+head_ac.e
 assert
 ctype
 errno
-head_ac.e
 headers
 locale
 math
 misc
-proto.make
 setjmp
 signal
 stdio
diff --git a/lang/cem/libcc.ansi/assert/.distr b/lang/cem/libcc.ansi/assert/.distr
index fc78f0f4e..87515cc41 100644
--- a/lang/cem/libcc.ansi/assert/.distr
+++ b/lang/cem/libcc.ansi/assert/.distr
@@ -1,3 +1 @@
-LIST
-Makefile
 assert.c
diff --git a/lang/cem/libcc.ansi/ctype/.distr b/lang/cem/libcc.ansi/ctype/.distr
index b159e6c0b..63a07fcf4 100644
--- a/lang/cem/libcc.ansi/ctype/.distr
+++ b/lang/cem/libcc.ansi/ctype/.distr
@@ -1,5 +1,3 @@
-LIST
-Makefile
 toupper.c
 tolower.c
 char.tab
diff --git a/lang/cem/libcc.ansi/errno/.distr b/lang/cem/libcc.ansi/errno/.distr
index d4c4f7db8..fd69e9793 100644
--- a/lang/cem/libcc.ansi/errno/.distr
+++ b/lang/cem/libcc.ansi/errno/.distr
@@ -1,3 +1 @@
-LIST
-Makefile
 errlist.c
diff --git a/lang/cem/libcc.ansi/headers/.distr b/lang/cem/libcc.ansi/headers/.distr
index eaf4f6b39..ba343e2df 100644
--- a/lang/cem/libcc.ansi/headers/.distr
+++ b/lang/cem/libcc.ansi/headers/.distr
@@ -1,5 +1,3 @@
-LIST
-Makefile
 assert.h
 ctype.h
 dirent.h
@@ -19,4 +17,5 @@ stdlib.h
 string.h
 time.h
 varargs.h
-sys
+sys/dirent.h
+sys/errno.h
diff --git a/lang/cem/libcc.ansi/locale/.distr b/lang/cem/libcc.ansi/locale/.distr
index 4e19646b6..6ec7d31e6 100644
--- a/lang/cem/libcc.ansi/locale/.distr
+++ b/lang/cem/libcc.ansi/locale/.distr
@@ -1,4 +1,2 @@
-LIST
-Makefile
 localeconv.c
 setlocale.c
diff --git a/lang/cem/libcc.ansi/math/.distr b/lang/cem/libcc.ansi/math/.distr
index 3a27813a4..39e542930 100644
--- a/lang/cem/libcc.ansi/math/.distr
+++ b/lang/cem/libcc.ansi/math/.distr
@@ -1,5 +1,3 @@
-LIST
-Makefile
 asin.c
 atan.c
 atan2.c
diff --git a/lang/cem/libcc.ansi/misc/.distr b/lang/cem/libcc.ansi/misc/.distr
index f2c13a92c..ed0771ead 100644
--- a/lang/cem/libcc.ansi/misc/.distr
+++ b/lang/cem/libcc.ansi/misc/.distr
@@ -1,5 +1,3 @@
-LIST
-Makefile
 closedir.c
 fdopen.c
 getdents.c
diff --git a/lang/cem/libcc.ansi/setjmp/.distr b/lang/cem/libcc.ansi/setjmp/.distr
index 0fb173527..63685a130 100644
--- a/lang/cem/libcc.ansi/setjmp/.distr
+++ b/lang/cem/libcc.ansi/setjmp/.distr
@@ -1,4 +1,2 @@
-LIST
-Makefile
 setjmp.e
 sigmisc.c
diff --git a/lang/cem/libcc.ansi/signal/.distr b/lang/cem/libcc.ansi/signal/.distr
index f3c0e4bfb..ff77f128d 100644
--- a/lang/cem/libcc.ansi/signal/.distr
+++ b/lang/cem/libcc.ansi/signal/.distr
@@ -1,3 +1 @@
-LIST
-Makefile
 raise.c
diff --git a/lang/cem/libcc.ansi/stdio/.distr b/lang/cem/libcc.ansi/stdio/.distr
index 06483bcac..927255d92 100644
--- a/lang/cem/libcc.ansi/stdio/.distr
+++ b/lang/cem/libcc.ansi/stdio/.distr
@@ -1,5 +1,3 @@
-LIST
-Makefile
 clearerr.c
 data.c
 doprnt.c
diff --git a/lang/cem/libcc.ansi/stdlib/.distr b/lang/cem/libcc.ansi/stdlib/.distr
index b1d2ecbbf..a556b3058 100644
--- a/lang/cem/libcc.ansi/stdlib/.distr
+++ b/lang/cem/libcc.ansi/stdlib/.distr
@@ -1,5 +1,3 @@
-LIST
-Makefile
 abort.c
 abs.c
 atexit.c
@@ -25,4 +23,3 @@ system.c
 wcstombs.c
 wctomb.c
 malloc
-malloc.c
diff --git a/lang/cem/libcc.ansi/stdlib/malloc/.distr b/lang/cem/libcc.ansi/stdlib/malloc/.distr
index 344e71485..e23a0ee82 100644
--- a/lang/cem/libcc.ansi/stdlib/malloc/.distr
+++ b/lang/cem/libcc.ansi/stdlib/malloc/.distr
@@ -1,4 +1,3 @@
-Makefile
 READ_ME
 add_file
 check.c
diff --git a/lang/cem/libcc.ansi/string/.distr b/lang/cem/libcc.ansi/string/.distr
index b59e61d48..f7ff5cc28 100644
--- a/lang/cem/libcc.ansi/string/.distr
+++ b/lang/cem/libcc.ansi/string/.distr
@@ -1,5 +1,3 @@
-LIST
-Makefile
 memchr.c
 memcmp.c
 memcpy.c
diff --git a/lang/cem/libcc.ansi/time/.distr b/lang/cem/libcc.ansi/time/.distr
index 5b4a1ad91..b53265c96 100644
--- a/lang/cem/libcc.ansi/time/.distr
+++ b/lang/cem/libcc.ansi/time/.distr
@@ -1,5 +1,3 @@
-LIST
-Makefile
 asctime.c
 clock.c
 ctime.c
diff --git a/lang/cem/libcc/.distr b/lang/cem/libcc/.distr
index eeee6c85c..9412e8f87 100644
--- a/lang/cem/libcc/.distr
+++ b/lang/cem/libcc/.distr
@@ -1,4 +1,6 @@
+pmfile
 gen
+headers
+math
 mon
 stdio
-math
diff --git a/lang/cem/libcc/gen/.distr b/lang/cem/libcc/gen/.distr
index 6fecacf86..a4b83bb42 100644
--- a/lang/cem/libcc/gen/.distr
+++ b/lang/cem/libcc/gen/.distr
@@ -1,3 +1,75 @@
-LIST
+pmfile
 head_cc.e
-tail_cc.2g.a
+abs.c
+atof.c
+strtod.c
+atoi.c
+atol.c
+strtol.c
+bcmp.c
+bfill.c
+bmove.c
+bzero.c
+calloc.c
+crypt.c
+ctime.c
+asctime.c
+execvp.c
+ffc.c
+ffs.c
+gcvt.c
+ecvt.c
+ext_comp.c
+getlogin.c
+index.c
+l3.c
+ldexp.c
+localtime.c
+gmtime.c
+memccpy.c
+memchr.c
+memcmp.c
+memcpy.c
+memset.c
+mktemp.c
+monitor.c
+perror.c
+procentry.c
+qsort.c
+bsearch.c
+rand.c
+seekdir.c
+sleep.c
+stb.c
+strstr.c
+strchr.c
+strcmp.c
+strcspn.c
+strncat.c
+strrchr.c
+strtok.c
+strpbrk.c
+strspn.c
+swab.c
+telldir.c
+ttyslot.c
+rindex.c
+strncmp.c
+ttyname.c
+closedir.c
+isatty.c
+opendir.c
+malloc.c
+bcopy.c
+readdir.c
+strcat.c
+strcpy.c
+strlen.c
+tzset.c
+getenv.c
+strncpy.c
+_c2type.c
+abort.e
+frexp.e
+modf.e
+setjmp.e
diff --git a/lang/cem/libcc/headers/.distr b/lang/cem/libcc/headers/.distr
index c25c1fe19..a415c0dd7 100644
--- a/lang/cem/libcc/headers/.distr
+++ b/lang/cem/libcc/headers/.distr
@@ -1,14 +1,19 @@
-ctype.h
-setjmp.h
-stdio.h
 assert.h
-varargs.h
-math.h
-time.h
-pwd.h
+ctype.h
+errno.h
+fcntl.h
 grp.h
+math.h
+pwd.h
+setjmp.h
 sgtty.h
 signal.h
-fcntl.h
-errno.h
-sys
+stdio.h
+time.h
+varargs.h
+sys/dir.h
+sys/errno.h
+sys/stat.h
+sys/stdtypes.h
+sys/types.h
+sys/timeb.h
diff --git a/lang/cem/libcc/headers/sys/.distr b/lang/cem/libcc/headers/sys/.distr
deleted file mode 100644
index 351726b33..000000000
--- a/lang/cem/libcc/headers/sys/.distr
+++ /dev/null
@@ -1,5 +0,0 @@
-dir.h
-stat.h
-types.h
-stdtypes.h
-errno.h
diff --git a/lang/cem/libcc/math/.distr b/lang/cem/libcc/math/.distr
index ff6c114e1..a6b3b1220 100644
--- a/lang/cem/libcc/math/.distr
+++ b/lang/cem/libcc/math/.distr
@@ -1,3 +1,21 @@
-LIST
-tail_m.a
-test.c
+pmfile
+asin.c
+atan2.c
+atan.c
+ceil.c
+fabs.c
+gamma.c
+hypot.c
+jn.c
+j0.c
+j1.c
+log10.c
+pow.c
+log.c
+sin.c
+sinh.c
+sqrt.c
+tan.c
+tanh.c
+exp.c
+floor.c
diff --git a/lang/cem/libcc/mon/.distr b/lang/cem/libcc/mon/.distr
index 25b2788f6..0ec396a35 100644
--- a/lang/cem/libcc/mon/.distr
+++ b/lang/cem/libcc/mon/.distr
@@ -1,3 +1,92 @@
-LIST
-tail_mon.a
+pmfile
+exit.c
+gtty.c
+signal.c
+stty.c
+tell.c
+time.c
+cleanup.c
+access.e
+acct.e
+alarm.e
+brk.e
+chdir.e
+chmod.e
+chown.e
+chroot.e
+close.e
+creat.e
+dup.e
+dup2.e
+execl.e
+execle.e
+execv.e
+execve.e
+fork.e
+fstat.e
+ftime.e
+getegid.e
+geteuid.e
+getgid.e
+getpid.e
+getuid.e
+ioctl.e
+kill.e
+link.e
+lock.e
+lseek.e
+mknod.e
+mount.e
+mpxcall.e
+nice.e
+open.e
+pause.e
+pipe.e
+prof.e
+ptrace.e
+read.e
+sbrk.e
+setgid.e
+setuid.e
+setsig.e
+sigtrp.e
+stat.e
+stime.e
+sync.e
+times.e
+umask.e
+umount.e
+unlink.e
+utime.e
+wait.e
+write.e
+errno.e
+_alarm.e
+_brk.e
+_close.e
+_creat.e
+_dup.e
+_dup2.e
+_execl.e
+_execve.e
+_exit.e
+_fork.e
+_fstat.e
+_ftime.e
+_getpid.e
+_gtty.c
+_stty.c
+_ioctl.e
+_kill.e
+_link.e
+_lseek.e
+_open.e
+_pause.e
+_pipe.e
+_read.e
+_sbrk.e
+_times.e
+_unlink.e
+_wait.e
+_write.e
 types
diff --git a/lang/cem/libcc/stdio/.distr b/lang/cem/libcc/stdio/.distr
index eb737c12f..728de5ee2 100644
--- a/lang/cem/libcc/stdio/.distr
+++ b/lang/cem/libcc/stdio/.distr
@@ -1,2 +1,48 @@
-LIST
-tail_cc.1s.a
+pmfile
+vsprintf.c
+vfprintf.c
+vprintf.c
+termcap.c
+getopt.c
+clearerr.c
+fgetc.c
+fgets.c
+fprintf.c
+fputc.c
+fputs.c
+fread.c
+freopen.c
+fscanf.c
+ftell.c
+fwrite.c
+getchar.c
+getgrent.c
+getpass.c
+getpw.c
+fopen.c
+getpwent.c
+gets.c
+getw.c
+popen.c
+fdopen.c
+printf.c
+putchar.c
+puts.c
+putw.c
+rewind.c
+fseek.c
+scanf.c
+setbuf.c
+sprintf.c
+doprnt.c
+fltpr.c
+flushbuf.c
+fclose.c
+data.c
+fflush.c
+sscanf.c
+doscan.c
+fillbuf.c
+system.c
+timezone.c
+ungetc.c
diff --git a/lang/m2/.distr b/lang/m2/.distr
index b97f839ff..9ed8b06d4 100644
--- a/lang/m2/.distr
+++ b/lang/m2/.distr
@@ -1,4 +1,3 @@
+pmfile
 comp
-m2mm
 libm2
-test
diff --git a/lang/m2/comp/.distr b/lang/m2/comp/.distr
index 6340fa61b..1ea799dbd 100644
--- a/lang/m2/comp/.distr
+++ b/lang/m2/comp/.distr
@@ -1,8 +1,7 @@
+pmfile
 LLlex.c
 LLlex.h
 LLmessage.c
-proto.make
-proto.main
 BigPars
 SmallPars
 SYSTEM.h
diff --git a/lang/m2/libm2/.distr b/lang/m2/libm2/.distr
index fe58ce32a..2cbf40d17 100644
--- a/lang/m2/libm2/.distr
+++ b/lang/m2/libm2/.distr
@@ -1,5 +1,50 @@
-LIST
-tail_m2.a
+pmfile
+Termcap.mod
+CSP.mod
+PascalIO.mod
+RealInOut.mod
+InOut.mod
+Streams.mod
+Terminal.mod
+MathLib0.mod
+Mathlib.mod
+Processes.mod
+RealConver.mod
+Storage.mod
+Conversion.mod
+Semaphores.mod
+random.mod
+Strings.mod
+ArraySort.mod
+catch.c
+Traps.mod
+XXTermcap.c
+dvi.c
+Arguments.c
+LtoUset.e
+StrAss.c
+cap.c
+absd.c
+absf.e
+absi.c
+absl.c
+halt.c
+SYSTEM.c
+par_misc.e
+init.c
+sigtrp.c
+store.c
+confarray.c
+load.c
+blockmove.c
+stackprio.c
+ucheck.c
+rcka.c
+rcku.c
+rcki.c
+rckul.c
+rckil.c
+EM.e
 ASCII.def
 Arguments.def
 Conversion.def
diff --git a/lang/occam/.distr b/lang/occam/.distr
index 8bf55613b..475b9ed71 100644
--- a/lang/occam/.distr
+++ b/lang/occam/.distr
@@ -1,3 +1,5 @@
+pmfile
 comp
 lib
 test
+headers
diff --git a/lang/occam/comp/.distr b/lang/occam/comp/.distr
index f28c36b9e..d220a92fb 100644
--- a/lang/occam/comp/.distr
+++ b/lang/occam/comp/.distr
@@ -1,10 +1,8 @@
-proto.make
-proto.main
+pmfile
 builtin.c
 code.c
 code.h
 em.c
-em.h
 expr.c
 expr.h
 keytab.c
@@ -15,3 +13,4 @@ sizes.h
 symtab.c
 symtab.h
 token.h
+occam-em.h
\ No newline at end of file
diff --git a/lang/occam/lib/.distr b/lang/occam/lib/.distr
index 5fb4e333b..1f306717f 100644
--- a/lang/occam/lib/.distr
+++ b/lang/occam/lib/.distr
@@ -1,2 +1,11 @@
-LIST
-tail_ocm.a
+pmfile
+builtin.c
+chan_strct.c
+channel.c
+co.c
+now.c
+par.c
+parco.c
+misc.e
+ocrt.c
+par_misc.e
diff --git a/lang/pc/.distr b/lang/pc/.distr
index 207bb7c2f..cbd3fb167 100644
--- a/lang/pc/.distr
+++ b/lang/pc/.distr
@@ -1,3 +1,3 @@
+pmfile
 libpc
 comp
-test
diff --git a/lang/pc/comp/.distr b/lang/pc/comp/.distr
index dbbee8684..3e7d26961 100644
--- a/lang/pc/comp/.distr
+++ b/lang/pc/comp/.distr
@@ -1,8 +1,7 @@
+pmfile
 LLlex.c
 LLlex.h
 LLmessage.c
-proto.make
-proto.main
 Parameters
 body.c
 casestat.C
diff --git a/lang/pc/libpc/.distr b/lang/pc/libpc/.distr
index 9417afea8..0a10ca561 100644
--- a/lang/pc/libpc/.distr
+++ b/lang/pc/libpc/.distr
@@ -1,5 +1,75 @@
-LIST
-Makefile
+pmfile
+abi.c
+abl.c
+abr.c
+arg.c
+ass.c
+asz.c
+atn.c
+bcp.c
+bts.e
+buff.c
+clock.c
+diag.c
+dis.c
+efl.c
+eln.c
+encaps.e
+exp.c
+get.c
+gto.e
+hlt.c
+ini.c
+catch.c
+log.c
+mdi.c
+mdl.c
+new.c
+nobuff.c
+notext.c
+opn.c
+hol0.e
+pac.c
+pclose.c
+pcreat.c
+pentry.c
+perrno.c
+pexit.c
+popen.c
+cls.c
+put.c
+rdc.c
+rdl.c
+rdr.c
+rdi.c
+rln.c
+rf.c
+rnd.c
+sav.e
+sig.e
+sin.c
+sqt.c
+fef.e
+string.c
+trap.e
+unp.c
+uread.c
+uwrite.c
+wdw.c
+incpt.c
+wrc.c
+wrf.c
+wri.c
+wrl.c
+wrr.c
+cvt.c
+fif.e
+wrz.c
+wrs.c
+outcpt.c
+wf.c
+nfa.c
+rcka.c
+trp.e
 READ_ME
 head_pc.e
-tail_pc.a
diff --git a/mach/i86/.distr b/mach/i86/.distr
index 0e32e7952..86584ff3c 100644
--- a/mach/i86/.distr
+++ b/mach/i86/.distr
@@ -1,10 +1,5 @@
-Action
-cv
+pmfile
+as
+ncg
 libem
 libend
-libsys
-as
-libfp
-ncg
-ce
-mach_params
diff --git a/mach/i86/libem/.distr b/mach/i86/libem/.distr
index d2b4f2884..a580bcb0c 100644
--- a/mach/i86/libem/.distr
+++ b/mach/i86/libem/.distr
@@ -1,2 +1,60 @@
-LIST
-libem_s.a
+pmfile
+adi.s
+and.s
+cii.s
+cms.s
+cmi4.s
+cmu4.s
+com.s
+csa2.s
+csb2.s
+csa4.s
+csb4.s
+cuu.s
+dup.s
+dvi.s
+dvi4.s
+dvu.s
+dvu4.s
+exg.s
+fp8087.s
+gto.s
+iaar.s
+ilar.s
+inn.s
+ior.s
+isar.s
+lar2.s
+loi.s
+mli.s
+mli4.s
+mon.s
+ngi.s
+nop.s
+rck.s
+rmi.s
+rmi4.s
+rmu.s
+rmu4.s
+rol.s
+ror.s
+sar2.s
+sbi.s
+set.s
+sli.s
+sri.s
+sti.s
+strhp.s
+xor.s
+error.s
+unknown.s
+fat.s
+trp.s
+print.s
+ret6.s
+ret8.s
+lfr6.s
+lfr8.s
+retarea.s
+blm.s
+return.s
diff --git a/mach/i86/libend/.distr b/mach/i86/libend/.distr
index b48ec8483..1508ebdc7 100644
--- a/mach/i86/libend/.distr
+++ b/mach/i86/libend/.distr
@@ -1,2 +1,5 @@
-LIST
-end_s.a
+pmfile
+edata.s
+em_end.s
+end.s
+etext.s
diff --git a/mach/proto/.distr b/mach/proto/.distr
index 46c0c1042..e34b0c9d7 100644
--- a/mach/proto/.distr
+++ b/mach/proto/.distr
@@ -1,7 +1,5 @@
+pmfile
 as
 cg
-libg
 ncg
 top
-fp
-grind
diff --git a/mach/proto/as/.distr b/mach/proto/as/.distr
index c5d073d03..4c6af5c3e 100644
--- a/mach/proto/as/.distr
+++ b/mach/proto/as/.distr
@@ -1,4 +1,4 @@
-proto.make
+pmfile
 comm0.h
 comm1.h
 comm2.y
diff --git a/mach/proto/cg/.distr b/mach/proto/cg/.distr
index 1f1c7df8b..dc488f32f 100644
--- a/mach/proto/cg/.distr
+++ b/mach/proto/cg/.distr
@@ -1,4 +1,4 @@
-proto.make
+pmfile
 assert.h
 codegen.c
 compute.c
diff --git a/mach/proto/ncg/.distr b/mach/proto/ncg/.distr
index 4e180009f..d8d384103 100644
--- a/mach/proto/ncg/.distr
+++ b/mach/proto/ncg/.distr
@@ -1,4 +1,4 @@
-proto.make
+pmfile
 assert.h
 codegen.c
 compute.c
diff --git a/mach/proto/top/.distr b/mach/proto/top/.distr
index 332bb6ee0..bb14a80cf 100644
--- a/mach/proto/top/.distr
+++ b/mach/proto/top/.distr
@@ -1,4 +1,4 @@
-proto.make
+pmfile
 queue.c
 queue.h
 top.c
diff --git a/modules/h/.distr b/modules/h/.distr
index ee7ba94dc..a365a15ef 100644
--- a/modules/h/.distr
+++ b/modules/h/.distr
@@ -3,8 +3,8 @@ em.h
 em_arith.h
 em_code.h
 em_label.h
-em_codeCE.h
-emO_code.h
+#em_codeCE.h
+#emO_code.h
 em_mesX.h
-em_codeO.h
-proto.make
+#em_codeO.h
+#proto.make
diff --git a/modules/src/alloc/.distr b/modules/src/alloc/.distr
index e45a8e0cb..fa07cf5d1 100644
--- a/modules/src/alloc/.distr
+++ b/modules/src/alloc/.distr
@@ -1,4 +1,4 @@
-proto.make
+pmfile
 Malloc.c
 Srealloc.c
 Realloc.c
diff --git a/modules/src/assert/.distr b/modules/src/assert/.distr
index 0403dc32f..34e11b290 100644
--- a/modules/src/assert/.distr
+++ b/modules/src/assert/.distr
@@ -1,4 +1,4 @@
+pmfile
 BadAssert.c
-proto.make
 assert.3
 assert.h
diff --git a/modules/src/em_code/.distr b/modules/src/em_code/.distr
index 5e20e79c9..45a94e8d3 100644
--- a/modules/src/em_code/.distr
+++ b/modules/src/em_code/.distr
@@ -1,4 +1,4 @@
-proto.make
+pmfile
 C_out.c
 bhcst.c
 bhdlb.c
diff --git a/modules/src/em_mes/.distr b/modules/src/em_mes/.distr
index d114f95dd..14eca8bbf 100644
--- a/modules/src/em_mes/.distr
+++ b/modules/src/em_mes/.distr
@@ -1,3 +1,4 @@
+pmfile
 C_ms_com.c
 C_ms_ego.c
 C_ms_emx.c
@@ -10,5 +11,4 @@ C_ms_reg.c
 C_ms_src.c
 C_ms_std.c
 C_ms_stb.c
-proto.make
 em_mes.3
diff --git a/modules/src/flt_arith/.distr b/modules/src/flt_arith/.distr
index b7a278a22..c5c0292b5 100644
--- a/modules/src/flt_arith/.distr
+++ b/modules/src/flt_arith/.distr
@@ -1,4 +1,4 @@
-proto.make
+pmfile
 b64_add.c
 b64_sft.c
 flt_add.c
diff --git a/modules/src/idf/.distr b/modules/src/idf/.distr
index 8eeb36c5a..4402cca9f 100644
--- a/modules/src/idf/.distr
+++ b/modules/src/idf/.distr
@@ -1,4 +1,4 @@
-proto.make
+pmfile
 idf.3
 idf_pkg.body
 idf_pkg.spec
diff --git a/modules/src/input/.distr b/modules/src/input/.distr
index cf4d624fe..fc3c9413f 100644
--- a/modules/src/input/.distr
+++ b/modules/src/input/.distr
@@ -1,6 +1,6 @@
+pmfile
 AtEoIF.c
 AtEoIT.c
-proto.make
 inp_pkg.body
 inp_pkg.spec
 input.3
diff --git a/modules/src/object/.distr b/modules/src/object/.distr
index 22da2715e..1ad72d93d 100644
--- a/modules/src/object/.distr
+++ b/modules/src/object/.distr
@@ -1,4 +1,4 @@
-proto.make
+pmfile
 object.3
 object.h
 obj.h
diff --git a/modules/src/print/.distr b/modules/src/print/.distr
index 66295c095..b23ff8f37 100644
--- a/modules/src/print/.distr
+++ b/modules/src/print/.distr
@@ -1,4 +1,4 @@
-proto.make
+pmfile
 doprnt.c
 format.c
 fprint.c
diff --git a/modules/src/read_em/.distr b/modules/src/read_em/.distr
index 98cbf5472..100499ee0 100644
--- a/modules/src/read_em/.distr
+++ b/modules/src/read_em/.distr
@@ -1,5 +1,5 @@
+pmfile
 EM_vars.c
-proto.make
 argtype
 em_comp.h
 m_C_mnem
diff --git a/modules/src/string/.distr b/modules/src/string/.distr
index a44d0db73..77bb9697d 100644
--- a/modules/src/string/.distr
+++ b/modules/src/string/.distr
@@ -1,4 +1,4 @@
-proto.make
+pmfile
 bts2str.c
 btscat.c
 btscmp.c
diff --git a/modules/src/system/.distr b/modules/src/system/.distr
index 20be46d12..2bfeb1de9 100644
--- a/modules/src/system/.distr
+++ b/modules/src/system/.distr
@@ -1,4 +1,4 @@
-proto.make
+pmfile
 access.c
 break.c
 chmode.c
diff --git a/plat/pc86/.distr b/plat/pc86/.distr
new file mode 100644
index 000000000..98965493d
--- /dev/null
+++ b/plat/pc86/.distr
@@ -0,0 +1,14 @@
+descr
+boot.s
+pmfile
+README
+libsys/pmfile
+libsys/libsys.h
+libsys/_sys_rawwrite.s
+libsys/_mon.s
+libsys/_sys_write.c
+libsys/_sys_read.c
+libsys/_sys_rawread.s
+libsys/_brk.s
+libsys/errno.s
+libsys/_sys_ioctl.c
diff --git a/util/LLgen/.distr b/util/LLgen/.distr
new file mode 100644
index 000000000..c8dcea78f
--- /dev/null
+++ b/util/LLgen/.distr
@@ -0,0 +1,26 @@
+pmfile-ack
+src/main.c
+src/gencode.c
+src/compute.c
+src/check.c
+src/reach.c
+src/global.c
+src/name.c
+src/sets.c
+src/sets.h
+src/alloc.c
+src/machdep.c
+src/cclass.c
+src/cclass.h
+src/savegram.c
+src/LLgen.c
+src/Lpars.c
+src/Lpars.h
+src/tokens.c
+src/types.h
+src/io.h
+src/extern.h
+lib/incl
+lib/rec
+lib/nc_incl
+lib/nc_rec
diff --git a/util/ack/.distr b/util/ack/.distr
index 4d844dc1a..47ebd56d7 100644
--- a/util/ack/.distr
+++ b/util/ack/.distr
@@ -1,4 +1,4 @@
-proto.make
+pmfile
 ack.h
 data.c
 data.h
diff --git a/util/amisc/.distr b/util/amisc/.distr
index f9ac79094..29a375aaa 100644
--- a/util/amisc/.distr
+++ b/util/amisc/.distr
@@ -1,4 +1,4 @@
-proto.make
+pmfile
 anm.c
 asize.c
 astrip.c
@@ -6,3 +6,5 @@ ashow.c
 anm.1
 asize.1
 astrip.1
+aslod.c
+aslod.1
diff --git a/util/arch/.distr b/util/arch/.distr
index 60b6f41cf..7a52ea34b 100644
--- a/util/arch/.distr
+++ b/util/arch/.distr
@@ -1,4 +1,4 @@
-proto.make
+pmfile
 aal.1
 arch.1
 arch.5
diff --git a/util/cgg/.distr b/util/cgg/.distr
index 4f5635a59..2a2ff68aa 100644
--- a/util/cgg/.distr
+++ b/util/cgg/.distr
@@ -1,4 +1,4 @@
-proto.make
+pmfile
 bootgram.y
 bootlex.l
 main.c
diff --git a/util/cmisc/.distr b/util/cmisc/.distr
index c54a3d964..fea42afee 100644
--- a/util/cmisc/.distr
+++ b/util/cmisc/.distr
@@ -1,5 +1,5 @@
+pmfile
 GCIPM.c
-proto.make
 cclash.1
 cclash.c
 cid.1
diff --git a/util/cpp/.distr b/util/cpp/.distr
index 53c19ae1f..7b896c676 100644
--- a/util/cpp/.distr
+++ b/util/cpp/.distr
@@ -1,7 +1,7 @@
+pmfile
 LLlex.c
 LLlex.h
 LLmessage.c
-proto.make
 Parameters
 bits.h
 ch7bin.c
diff --git a/util/data/.distr b/util/data/.distr
index 7a82b882f..238202998 100644
--- a/util/data/.distr
+++ b/util/data/.distr
@@ -1,5 +1,3 @@
-proto.make
-em_flag.c
-em_mnem.c
-em_pseu.c
+pmfile
 em_ptyp.c
+new_table
diff --git a/util/ego/.distr b/util/ego/.distr
index a6ef8d584..49f46d9aa 100644
--- a/util/ego/.distr
+++ b/util/ego/.distr
@@ -1,4 +1,4 @@
-Action
+pmfile
 bo
 ca
 cf
diff --git a/util/ego/bo/.distr b/util/ego/bo/.distr
index 51e87ef5b..717995eb9 100644
--- a/util/ego/bo/.distr
+++ b/util/ego/bo/.distr
@@ -1,2 +1 @@
-proto.make
 bo.c
diff --git a/util/ego/ca/.distr b/util/ego/ca/.distr
index 36cfb625d..4493273f6 100644
--- a/util/ego/ca/.distr
+++ b/util/ego/ca/.distr
@@ -1,4 +1,3 @@
-proto.make
 ca.c
 ca.h
 ca_put.c
diff --git a/util/ego/cf/.distr b/util/ego/cf/.distr
index dffea940e..ee48a1028 100644
--- a/util/ego/cf/.distr
+++ b/util/ego/cf/.distr
@@ -1,4 +1,3 @@
-proto.make
 cf.c
 cf.h
 cf_idom.c
diff --git a/util/ego/cj/.distr b/util/ego/cj/.distr
index 68afa918d..9cf50ef85 100644
--- a/util/ego/cj/.distr
+++ b/util/ego/cj/.distr
@@ -1,2 +1 @@
-proto.make
 cj.c
diff --git a/util/ego/cs/.distr b/util/ego/cs/.distr
index b29cf0d60..a364eaea8 100644
--- a/util/ego/cs/.distr
+++ b/util/ego/cs/.distr
@@ -1,4 +1,3 @@
-proto.make
 cs.c
 cs.h
 cs_alloc.c
diff --git a/util/ego/descr/.distr b/util/ego/descr/.distr
index 9e16320a4..f7d566cd5 100644
--- a/util/ego/descr/.distr
+++ b/util/ego/descr/.distr
@@ -1,4 +1,3 @@
-proto.make
 descr.sed
 i86.descr
 i386.descr
diff --git a/util/ego/em_ego/.distr b/util/ego/em_ego/.distr
index 3fe622854..3a123f69d 100644
--- a/util/ego/em_ego/.distr
+++ b/util/ego/em_ego/.distr
@@ -1,2 +1 @@
-proto.make
 em_ego.c
diff --git a/util/ego/ic/.distr b/util/ego/ic/.distr
index 8b45f7871..eb09cd319 100644
--- a/util/ego/ic/.distr
+++ b/util/ego/ic/.distr
@@ -1,4 +1,3 @@
-proto.make
 ic.c
 ic.h
 ic_aux.c
diff --git a/util/ego/il/.distr b/util/ego/il/.distr
index 9f8b76dac..c34e2ee46 100644
--- a/util/ego/il/.distr
+++ b/util/ego/il/.distr
@@ -1,4 +1,3 @@
-proto.make
 il.c
 il.h
 il1_anal.c
diff --git a/util/ego/lv/.distr b/util/ego/lv/.distr
index 8ef6fed75..634cc49c9 100644
--- a/util/ego/lv/.distr
+++ b/util/ego/lv/.distr
@@ -1,3 +1,2 @@
-proto.make
 lv.c
 lv.h
diff --git a/util/ego/ra/.distr b/util/ego/ra/.distr
index 64079fc6b..7faba06c3 100644
--- a/util/ego/ra/.distr
+++ b/util/ego/ra/.distr
@@ -1,4 +1,3 @@
-proto.make
 itemtab.src
 makeitems.c
 ra.c
diff --git a/util/ego/share/.distr b/util/ego/share/.distr
index 24edcfe1a..7646bcb74 100644
--- a/util/ego/share/.distr
+++ b/util/ego/share/.distr
@@ -1,4 +1,3 @@
-proto.make
 alloc.c
 alloc.h
 aux.c
diff --git a/util/ego/sp/.distr b/util/ego/sp/.distr
index 4baeb1c50..583ccc056 100644
--- a/util/ego/sp/.distr
+++ b/util/ego/sp/.distr
@@ -1,2 +1 @@
-proto.make
 sp.c
diff --git a/util/ego/sr/.distr b/util/ego/sr/.distr
index ae9d662b9..f2d3fd886 100644
--- a/util/ego/sr/.distr
+++ b/util/ego/sr/.distr
@@ -1,4 +1,3 @@
-proto.make
 sr.c
 sr.h
 sr_aux.c
diff --git a/util/ego/ud/.distr b/util/ego/ud/.distr
index 850242a48..0d6ef5e95 100644
--- a/util/ego/ud/.distr
+++ b/util/ego/ud/.distr
@@ -1,4 +1,3 @@
-proto.make
 ud.c
 ud.h
 ud_aux.c
diff --git a/util/led/.distr b/util/led/.distr
index b8ec32f11..6d4ff4c24 100644
--- a/util/led/.distr
+++ b/util/led/.distr
@@ -1,4 +1,4 @@
-proto.make
+pmfile
 WRONG
 ack.out.5
 archive.c
diff --git a/util/misc/.distr b/util/misc/.distr
index c9c3be1b9..85e58eff3 100644
--- a/util/misc/.distr
+++ b/util/misc/.distr
@@ -1,4 +1,4 @@
-proto.make
+pmfile
 convert.c
 em_decode.6
 esize.1
diff --git a/util/ncgg/.distr b/util/ncgg/.distr
index aef3e3d35..f90b6e519 100644
--- a/util/ncgg/.distr
+++ b/util/ncgg/.distr
@@ -1,4 +1,4 @@
-proto.make
+pmfile
 assert.h
 cgg.y
 coerc.c
diff --git a/util/opt/.distr b/util/opt/.distr
index f541a4f02..de2d23cf5 100644
--- a/util/opt/.distr
+++ b/util/opt/.distr
@@ -1,4 +1,4 @@
-proto.make
+pmfile
 alloc.c
 alloc.h
 assert.h
diff --git a/util/topgen/.distr b/util/topgen/.distr
index 7475a7d63..52cb94313 100644
--- a/util/topgen/.distr
+++ b/util/topgen/.distr
@@ -1,4 +1,4 @@
-proto.make
+pmfile
 LLlex.c
 hash.c
 main.c