diff --git a/lang/m2/libm2/pmfile b/lang/m2/libm2/pmfile
new file mode 100644
index 000000000..0a4c5975e
--- /dev/null
+++ b/lang/m2/libm2/pmfile
@@ -0,0 +1,57 @@
+-- $Source$
+-- $State$
+
+local d = ROOTDIR.."lang/m2/libm2/"
+
+lang_m2_runtime = acklibrary {
+	ACKINCLUDES = {PARENT, "-I%ROOTDIR%h", "-I%ROOTDIR%include/_tail_cc"},
+	
+	ackfile (d.."Termcap.mod"),
+	ackfile (d.."CSP.mod"),
+	ackfile (d.."PascalIO.mod"),
+	ackfile (d.."RealInOut.mod"),
+	ackfile (d.."InOut.mod"),
+	ackfile (d.."Streams.mod"),
+	ackfile (d.."Terminal.mod"),
+	ackfile (d.."MathLib0.mod"),
+	ackfile (d.."Mathlib.mod"),
+	ackfile (d.."Processes.mod"),
+	ackfile (d.."RealConver.mod"),
+	ackfile (d.."Storage.mod"),
+	ackfile (d.."Conversion.mod"),
+	ackfile (d.."Semaphores.mod"),
+	ackfile (d.."random.mod"),
+	ackfile (d.."Strings.mod"),
+	ackfile (d.."ArraySort.mod"),
+	ackfile (d.."catch.c"),
+	ackfile (d.."Traps.mod"),
+	ackfile (d.."XXTermcap.c"),
+	ackfile (d.."dvi.c"),
+	ackfile (d.."Arguments.c"),
+	ackfile (d.."LtoUset.e"),
+	ackfile (d.."StrAss.c"),
+	ackfile (d.."cap.c"),
+	ackfile (d.."absd.c"),
+	ackfile (d.."absf.e"),
+	ackfile (d.."absi.c"),
+	ackfile (d.."absl.c"),
+	ackfile (d.."halt.c"),
+	ackfile (d.."SYSTEM.c"),
+	ackfile (d.."par_misc.e"),
+	ackfile (d.."init.c"),
+	ackfile (d.."sigtrp.c"),
+	ackfile (d.."store.c"),
+	ackfile (d.."confarray.c"),
+	ackfile (d.."load.c"),
+	ackfile (d.."blockmove.c"),
+	ackfile (d.."stackprio.c"),
+	ackfile (d.."ucheck.c"),
+	ackfile (d.."rcka.c"),
+	ackfile (d.."rcku.c"),
+	ackfile (d.."rcki.c"),
+	ackfile (d.."rckul.c"),
+	ackfile (d.."rckil.c"),
+	ackfile (d.."EM.e"),
+	
+	install = pm.install("%BINDIR%%PLATIND%/%ARCH%/tail_m2.a")
+}
diff --git a/lang/m2/pmfile b/lang/m2/pmfile
index 8b8092d1b..59270fd62 100644
--- a/lang/m2/pmfile
+++ b/lang/m2/pmfile
@@ -4,15 +4,4 @@
 local d = ROOTDIR.."lang/m2/"
 
 include (d.."comp/pmfile")
-
-lang_m2 = group {
-	lang_m2_compiler
-}
-
--- Revision history
--- $Log$
--- Revision 1.2  2006-07-26 18:19:15  dtrg
--- Tweaked the CVS settings.
---
--- Revision 1.1  2006/07/26 17:12:19  dtrg
--- Added support for the Modula-2 compiler.
+include (d.."libm2/pmfile")
diff --git a/pmfile b/pmfile
index 244a5cf1e..e8ebde13f 100644
--- a/pmfile
+++ b/pmfile
@@ -76,6 +76,7 @@ include "mach/z8000/pmfile"
 
 lang_runtimes = group {
 	lang_pc_runtime,
+	lang_m2_runtime,
 	lang_occam_runtime,
 	lang_basic_runtime,
 }
@@ -120,7 +121,7 @@ default = group {
 	lang_cem_cemcom,
 	lang_cem_cemcom_ansi,
 	lang_pc_compiler,
-	lang_m2,
+	lang_m2_compiler,
 	lang_occam_compiler,
 	lang_basic_compiler,
 
@@ -136,7 +137,7 @@ default = group {
 --	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_pdp,      lang_runtimes { ARCH="pdp", OPTIMISATION="-O6" },
 	mach_s2650,
 --	mach_vax4,     lang_runtimes { ARCH="vax4", OPTIMISATION="-O" },
 	mach_z80,      lang_runtimes { ARCH="z80", OPTIMISATION="-O" },
@@ -175,7 +176,10 @@ configure = simple {
 
 -- Revision history
 -- $Log$
--- Revision 1.13  2006-07-27 22:07:38  dtrg
+-- Revision 1.14  2006-07-27 22:14:55  dtrg
+-- Added support for the Modula-2 language runtime.
+--
+-- Revision 1.13  2006/07/27 22:07:38  dtrg
 -- Added support for the Pascal language runtime.
 --
 -- Revision 1.12  2006/07/27 21:58:13  dtrg