diff --git a/lang/basic/lib/pmfile b/lang/basic/lib/pmfile
new file mode 100644
index 000000000..2e40d3903
--- /dev/null
+++ b/lang/basic/lib/pmfile
@@ -0,0 +1,44 @@
+-- $Source$
+-- $State$
+
+local d = ROOTDIR.."lang/basic/lib/"
+
+lang_basic_runtime = acklibrary {
+	ACKINCLUDES = {PARENT, "-I%ROOTDIR%h", "-I%ROOTDIR%include/_tail_cc"},
+	
+	ackfile (d.."fif.e"),
+	ackfile (d.."fef.e"),
+	ackfile (d.."setline.e"),
+	ackfile (d.."abs.c"),
+	ackfile (d.."asc.c"),
+	ackfile (d.."asrt.c"),
+	ackfile (d.."atn.c"),
+	ackfile (d.."chr.c"),
+	ackfile (d.."conversion.c"),
+	ackfile (d.."error.c"),
+	ackfile (d.."exp.c"),
+	ackfile (d.."file.c"),
+	ackfile (d.."hlt.c"),
+	ackfile (d.."io.c"),
+	ackfile (d.."log.c"),
+	ackfile (d.."mki.c"),
+	ackfile (d.."oct.c"),
+	ackfile (d.."peek.c"),
+	ackfile (d.."power.c"),
+	ackfile (d.."print.c"),
+	ackfile (d.."random.c"),
+	ackfile (d.."read.c"),
+	ackfile (d.."return.c"),
+	ackfile (d.."salloc.c"),
+	ackfile (d.."sgn.c"),
+	ackfile (d.."sin.c"),
+	ackfile (d.."sqt.c"),
+	ackfile (d.."stop.c"),
+	ackfile (d.."string.c"),
+	ackfile (d.."swap.c"),
+	ackfile (d.."trace.c"),
+	ackfile (d.."trap.c"),
+	ackfile (d.."write.c"),
+	
+	install = pm.install("%BINDIR%%PLATIND%/%ARCH%/tail_bc.a")
+}
diff --git a/lang/basic/pmfile b/lang/basic/pmfile
index fb1768643..180d1a2ae 100644
--- a/lang/basic/pmfile
+++ b/lang/basic/pmfile
@@ -4,13 +4,4 @@
 local d = ROOTDIR.."lang/basic/"
 
 include (d.."src/pmfile")
-
-lang_basic = group {
-	lang_basic_compiler
-}
-
--- Revision history
--- $Log$
--- Revision 1.1  2006-07-26 23:08:09  dtrg
--- Added support for the Basic compiler.
---
\ No newline at end of file
+include (d.."lib/pmfile")
diff --git a/lang/occam/lib/pmfile b/lang/occam/lib/pmfile
new file mode 100644
index 000000000..0aa93efc0
--- /dev/null
+++ b/lang/occam/lib/pmfile
@@ -0,0 +1,21 @@
+-- $Source$
+-- $State$
+
+local d = ROOTDIR.."lang/occam/lib/"
+
+lang_occam_runtime = acklibrary {
+	ACKINCLUDES = {PARENT, "-I%ROOTDIR%h", "-I%ROOTDIR%include/_tail_cc"},
+	
+	ackfile (d.."builtin.c"),
+	ackfile (d.."chan_strct.c"),
+	ackfile (d.."channel.c"),
+	ackfile (d.."co.c"),
+	ackfile (d.."misc.e"),
+	ackfile (d.."now.c"),
+	ackfile (d.."ocrt.c"),
+	ackfile (d.."par.c"),
+	ackfile (d.."par_misc.e"),
+	ackfile (d.."parco.c"),
+	
+	install = pm.install("%BINDIR%%PLATIND%/%ARCH%/tail_ocm.a")
+}
diff --git a/lang/occam/pmfile b/lang/occam/pmfile
index d7dfa0ed7..5ab78f51e 100644
--- a/lang/occam/pmfile
+++ b/lang/occam/pmfile
@@ -4,13 +4,4 @@
 local d = ROOTDIR.."lang/occam/"
 
 include (d.."comp/pmfile")
-
-lang_occam = group {
-	lang_m2_compiler
-}
-
--- Revision history
--- $Log$
--- Revision 1.1  2006-07-26 18:23:32  dtrg
--- Added support for the Occam compiler.
---
\ No newline at end of file
+include (d.."lib/pmfile")
diff --git a/pmfile b/pmfile
index 766d59c9e..721e1ff5b 100644
--- a/pmfile
+++ b/pmfile
@@ -4,8 +4,8 @@
 include "first/c.pm"
 include "first/yacc.pm"
 include "first/llgen.pm"
-include "first/ack-custom.pm"
 include "config.pm"
+include "first/ack.pm"
 
 CINCLUDES = {
 	"-I"..ROOTDIR.."h",
@@ -72,6 +72,13 @@ include "mach/vax4/pmfile"
 include "mach/z80/pmfile"
 include "mach/z8000/pmfile"
 
+-- This is the list of language runtimes that is built for each architecture.
+
+lang_runtimes = group {
+	lang_occam_runtime,
+	lang_basic_runtime,
+}
+
 default = group {
 	-- Some of the dependency management across modules isn't entirely
 	-- complete, for simplicity; as a result, the order here is important.
@@ -113,26 +120,26 @@ default = group {
 	lang_cem_cemcom_ansi,
 	lang_pc,
 	lang_m2,
-	lang_occam,
-	lang_basic,
+	lang_occam_compiler,
+	lang_basic_compiler,
 
-	mach_6500,
+	mach_6500,     lang_runtimes { ARCH="6500", OPTIMISATION="-O" },
 	mach_6800,
 	mach_6805,
 	mach_6809,
-	mach_arm,
-	mach_i386,
-	mach_i80,
-	mach_i86,
-	mach_m68020,
-	mach_m68k2,
-	mach_m68k4,
-	mach_ns,
-	mach_pdp,
+	mach_arm,      lang_runtimes { ARCH="arm", OPTIMISATION="-O" },
+	mach_i386,     lang_runtimes { ARCH="i386", OPTIMISATION="-O3" },
+	mach_i80,      lang_runtimes { ARCH="i80", OPTIMISATION="-O" },
+	mach_i86,      lang_runtimes { ARCH="i86", OPTIMISATION="-O6" },
+	mach_m68020,   lang_runtimes { ARCH="m68020", OPTIMISATION="-O6" },
+--	mach_m68k2,    lang_runtimes { ARCH="m68k2", OPTIMISATION="-O" },
+--	mach_m68k4,    lang_runtimes { ARCH="m68k4", OPTIMISATION="-O6" },
+	mach_ns,       lang_runtimes { ARCH="ns", OPTIMISATION="-O" },
+	mach_pdp,      lang_runtimes { ARCH="pdp", OPTIMISATION="-O6" },
 	mach_s2650,
-	mach_vax4,
-	mach_z80,
-	mach_z8000,
+--	mach_vax4,     lang_runtimes { ARCH="vax4", OPTIMISATION="-O" },
+	mach_z80,      lang_runtimes { ARCH="z80", OPTIMISATION="-O" },
+	mach_z8000,    lang_runtimes { ARCH="z8000", OPTIMISATION="-O" },
 }
 
 -- Ensure that the work directories exist.
@@ -167,7 +174,10 @@ configure = simple {
 
 -- Revision history
 -- $Log$
--- Revision 1.11  2006-07-26 23:08:09  dtrg
+-- Revision 1.12  2006-07-27 21:58:13  dtrg
+-- Added support for the Basic and Occam language runtimes.
+--
+-- Revision 1.11  2006/07/26 23:08:09  dtrg
 -- Added support for the Basic compiler.
 --
 -- Revision 1.10  2006/07/26 18:23:32  dtrg