diff --git a/lang/cem/cemcom.ansi/pmfile b/lang/cem/cemcom.ansi/pmfile
index a7932df2a..ed393a596 100644
--- a/lang/cem/cemcom.ansi/pmfile
+++ b/lang/cem/cemcom.ansi/pmfile
@@ -93,7 +93,7 @@ local cfile_with_headers = cfile {
 	}
 }
 	
-lang_cem_cemcom_ansi = cprogram {
+lang_cem_ansi_compiler = cprogram {
 	cfile_with_headers (d.."LLlex.c"),
 	cfile_with_headers (d.."LLmessage.c"),
 	cfile_with_headers (d.."arith.c"),
@@ -208,9 +208,3 @@ lang_cem_cemcom_ansi = cprogram {
 		pm.install(d.."cemcom.ansi.1", BINDIR.."/man/man1/cemcom.ansi.1"),
 	}
 }
-
--- Revision history
--- $Log$
--- Revision 1.1  2006-07-20 23:18:18  dtrg
--- First version in CVS.
---
diff --git a/lang/cem/cemcom/pmfile b/lang/cem/cemcom/pmfile
index 11e674182..de97377d5 100644
--- a/lang/cem/cemcom/pmfile
+++ b/lang/cem/cemcom/pmfile
@@ -94,7 +94,7 @@ local cfile_with_headers = cfile {
 	}
 }
 	
-lang_cem_cemcom = cprogram {
+lang_cem_compiler = cprogram {
 	cfile_with_headers (d.."LLlex.c"),
 	cfile_with_headers (d.."LLmessage.c"),
 	cfile_with_headers (d.."arith.c"),
@@ -207,9 +207,3 @@ lang_cem_cemcom = cprogram {
 		pm.install(d.."cemcom.1",      BINDIR.."/man/man1/cemcom.1"),
 	}
 }
-
--- Revision history
--- $Log$
--- Revision 1.1  2006-07-20 23:18:18  dtrg
--- First version in CVS.
---
diff --git a/lang/cem/libcc/gen/pmfile b/lang/cem/libcc/gen/pmfile
new file mode 100644
index 000000000..a1b0180a4
--- /dev/null
+++ b/lang/cem/libcc/gen/pmfile
@@ -0,0 +1,84 @@
+-- $Source$
+-- $State$
+
+local d = ROOTDIR.."lang/cem/libcc/gen/"
+
+lang_cem_gen_runtime = acklibrary {
+	ACKINCLUDES = {PARENT, "-I%ROOTDIR%h", "-I%ROOTDIR%include/_tail_cc"},
+	
+	ackfile (d.."abs.c"),
+	ackfile (d.."atof.c"),
+	ackfile (d.."strtod.c"),
+	ackfile (d.."atoi.c"),
+	ackfile (d.."atol.c"),
+	ackfile (d.."strtol.c"),
+	ackfile (d.."bcmp.c"),
+	ackfile (d.."bfill.c"),
+	ackfile (d.."bmove.c"),
+	ackfile (d.."bzero.c"),
+	ackfile (d.."calloc.c"),
+	ackfile (d.."crypt.c"),
+	ackfile (d.."ctime.c"),
+	ackfile (d.."asctime.c"),
+	ackfile (d.."execvp.c"),
+	ackfile (d.."ffc.c"),
+	ackfile (d.."ffs.c"),
+	ackfile (d.."gcvt.c"),
+	ackfile (d.."ecvt.c"),
+	ackfile (d.."ext_comp.c"),
+	ackfile (d.."getlogin.c"),
+	ackfile (d.."index.c"),
+	ackfile (d.."l3.c"),
+	ackfile (d.."ldexp.c"),
+	ackfile (d.."localtime.c"),
+	ackfile (d.."gmtime.c"),
+	ackfile (d.."memccpy.c"),
+	ackfile (d.."memchr.c"),
+	ackfile (d.."memcmp.c"),
+	ackfile (d.."memcpy.c"),
+	ackfile (d.."memset.c"),
+	ackfile (d.."mktemp.c"),
+	ackfile (d.."monitor.c"),
+	ackfile (d.."perror.c"),
+	ackfile (d.."procentry.c"),
+	ackfile (d.."qsort.c"),
+	ackfile (d.."bsearch.c"),
+	ackfile (d.."rand.c"),
+	ackfile (d.."seekdir.c"),
+	ackfile (d.."sleep.c"),
+	ackfile (d.."stb.c"),
+	ackfile (d.."strstr.c"),
+	ackfile (d.."strchr.c"),
+	ackfile (d.."strcmp.c"),
+	ackfile (d.."strcspn.c"),
+	ackfile (d.."strncat.c"),
+	ackfile (d.."strrchr.c"),
+	ackfile (d.."strtok.c"),
+	ackfile (d.."strpbrk.c"),
+	ackfile (d.."strspn.c"),
+	ackfile (d.."swab.c"),
+	ackfile (d.."telldir.c"),
+	ackfile (d.."ttyslot.c"),
+	ackfile (d.."rindex.c"),
+	ackfile (d.."strncmp.c"),
+	ackfile (d.."ttyname.c"),
+	ackfile (d.."closedir.c"),
+	ackfile (d.."isatty.c"),
+	ackfile (d.."opendir.c"),
+	ackfile (d.."malloc.c"),
+	ackfile (d.."bcopy.c"),
+	ackfile (d.."readdir.c"),
+	ackfile (d.."strcat.c"),
+	ackfile (d.."strcpy.c"),
+	ackfile (d.."strlen.c"),
+	ackfile (d.."tzset.c"),
+	ackfile (d.."getenv.c"),
+	ackfile (d.."strncpy.c"),
+	ackfile (d.."_c2type.c"),
+	ackfile (d.."abort.e"),
+	ackfile (d.."frexp.e"),
+	ackfile (d.."modf.e"),
+	ackfile (d.."setjmp.e"),
+
+	install = pm.install("%BINDIR%%PLATIND%/%ARCH%/tail_cc.2g.a")
+}
diff --git a/lang/cem/libcc/math/pmfile b/lang/cem/libcc/math/pmfile
new file mode 100644
index 000000000..5b482f1e7
--- /dev/null
+++ b/lang/cem/libcc/math/pmfile
@@ -0,0 +1,31 @@
+-- $Source$
+-- $State$
+
+local d = ROOTDIR.."lang/cem/libcc/math/"
+
+lang_cem_math_runtime = acklibrary {
+	ACKINCLUDES = {PARENT, "-I%ROOTDIR%h", "-I%ROOTDIR%include/_tail_cc"},
+	
+	ackfile (d.."asin.c"),
+	ackfile (d.."atan2.c"),
+	ackfile (d.."atan.c"),
+	ackfile (d.."ceil.c"),
+	ackfile (d.."fabs.c"),
+	ackfile (d.."gamma.c"),
+	ackfile (d.."hypot.c"),
+	ackfile (d.."jn.c"),
+	ackfile (d.."j0.c"),
+	ackfile (d.."j1.c"),
+	ackfile (d.."log10.c"),
+	ackfile (d.."pow.c"),
+	ackfile (d.."log.c"),
+	ackfile (d.."sin.c"),
+	ackfile (d.."sinh.c"),
+	ackfile (d.."sqrt.c"),
+	ackfile (d.."tan.c"),
+	ackfile (d.."tanh.c"),
+	ackfile (d.."exp.c"),
+	ackfile (d.."floor.c"),
+
+	install = pm.install("%BINDIR%%PLATIND%/%ARCH%/tail_m.a")
+}
diff --git a/lang/cem/libcc/mon/pmfile b/lang/cem/libcc/mon/pmfile
new file mode 100644
index 000000000..1c143f95e
--- /dev/null
+++ b/lang/cem/libcc/mon/pmfile
@@ -0,0 +1,102 @@
+-- $Source$
+-- $State$
+
+local d = ROOTDIR.."lang/cem/libcc/mon/"
+
+lang_cem_mon_runtime = acklibrary {
+	ACKINCLUDES = {PARENT, "-I%ROOTDIR%h", "-I%ROOTDIR%include/_tail_cc",
+		"-I%ROOTDIR%include/_tail_mon"},
+	
+	ackfile (d.."exit.c"),
+	ackfile (d.."gtty.c"),
+	ackfile (d.."signal.c"),
+	ackfile (d.."stty.c"),
+	ackfile (d.."tell.c"),
+	ackfile (d.."time.c"),
+	ackfile (d.."cleanup.c"),
+	ackfile (d.."access.e"),
+	ackfile (d.."acct.e"),
+	ackfile (d.."alarm.e"),
+	ackfile (d.."brk.e"),
+	ackfile (d.."chdir.e"),
+	ackfile (d.."chmod.e"),
+	ackfile (d.."chown.e"),
+	ackfile (d.."chroot.e"),
+	ackfile (d.."close.e"),
+	ackfile (d.."creat.e"),
+	ackfile (d.."dup.e"),
+	ackfile (d.."dup2.e"),
+	ackfile (d.."execl.e"),
+	ackfile (d.."execle.e"),
+	ackfile (d.."execv.e"),
+	ackfile (d.."execve.e"),
+	ackfile (d.."fork.e"),
+	ackfile (d.."fstat.e"),
+	ackfile (d.."ftime.e"),
+	ackfile (d.."getegid.e"),
+	ackfile (d.."geteuid.e"),
+	ackfile (d.."getgid.e"),
+	ackfile (d.."getpid.e"),
+	ackfile (d.."getuid.e"),
+	ackfile (d.."ioctl.e"),
+	ackfile (d.."kill.e"),
+	ackfile (d.."link.e"),
+	ackfile (d.."lock.e"),
+	ackfile (d.."lseek.e"),
+	ackfile (d.."mknod.e"),
+	ackfile (d.."mount.e"),
+	ackfile (d.."mpxcall.e"),
+	ackfile (d.."nice.e"),
+	ackfile (d.."open.e"),
+	ackfile (d.."pause.e"),
+	ackfile (d.."pipe.e"),
+	ackfile (d.."prof.e"),
+	ackfile (d.."ptrace.e"),
+	ackfile (d.."read.e"),
+	ackfile (d.."sbrk.e"),
+	ackfile (d.."setgid.e"),
+	ackfile (d.."setuid.e"),
+	ackfile (d.."setsig.e"),
+	ackfile (d.."sigtrp.e"),
+	ackfile (d.."stat.e"),
+	ackfile (d.."stime.e"),
+	ackfile (d.."sync.e"),
+	ackfile (d.."times.e"),
+	ackfile (d.."umask.e"),
+	ackfile (d.."umount.e"),
+	ackfile (d.."unlink.e"),
+	ackfile (d.."utime.e"),
+	ackfile (d.."wait.e"),
+	ackfile (d.."write.e"),
+	ackfile (d.."errno.e"),
+	ackfile (d.."_alarm.e"),
+	ackfile (d.."_brk.e"),
+	ackfile (d.."_close.e"),
+	ackfile (d.."_creat.e"),
+	ackfile (d.."_dup.e"),
+	ackfile (d.."_dup2.e"),
+	ackfile (d.."_execl.e"),
+	ackfile (d.."_execve.e"),
+	ackfile (d.."_exit.e"),
+	ackfile (d.."_fork.e"),
+	ackfile (d.."_fstat.e"),
+	ackfile (d.."_ftime.e"),
+	ackfile (d.."_getpid.e"),
+	ackfile (d.."_gtty.c"),
+	ackfile (d.."_stty.c"),
+	ackfile (d.."_ioctl.e"),
+	ackfile (d.."_kill.e"),
+	ackfile (d.."_link.e"),
+	ackfile (d.."_lseek.e"),
+	ackfile (d.."_open.e"),
+	ackfile (d.."_pause.e"),
+	ackfile (d.."_pipe.e"),
+	ackfile (d.."_read.e"),
+	ackfile (d.."_sbrk.e"),
+	ackfile (d.."_times.e"),
+	ackfile (d.."_unlink.e"),
+	ackfile (d.."_wait.e"),
+	ackfile (d.."_write.e"),
+
+	install = pm.install("%BINDIR%%PLATIND%/%ARCH%/tail_mon.a")
+}
diff --git a/lang/cem/libcc/pmfile b/lang/cem/libcc/pmfile
new file mode 100644
index 000000000..18b3e3c3e
--- /dev/null
+++ b/lang/cem/libcc/pmfile
@@ -0,0 +1,16 @@
+-- $Source$
+-- $State$
+
+local d = ROOTDIR.."lang/cem/libcc/"
+
+include (d.."gen/pmfile")
+include (d.."math/pmfile")
+include (d.."mon/pmfile")
+include (d.."stdio/pmfile")
+
+lang_cem_runtime = group {
+	lang_cem_gen_runtime,
+	lang_cem_math_runtime,
+	lang_cem_mon_runtime,
+	lang_cem_stdio_runtime
+}
diff --git a/lang/cem/libcc/stdio/pmfile b/lang/cem/libcc/stdio/pmfile
new file mode 100644
index 000000000..fa047183e
--- /dev/null
+++ b/lang/cem/libcc/stdio/pmfile
@@ -0,0 +1,58 @@
+-- $Source$
+-- $State$
+
+local d = ROOTDIR.."lang/cem/libcc/stdio/"
+
+lang_cem_stdio_runtime = acklibrary {
+	ACKINCLUDES = {PARENT, "-I%ROOTDIR%h", "-I%ROOTDIR%include/_tail_cc"},
+	
+	ackfile (d.."vsprintf.c"),
+	ackfile (d.."vfprintf.c"),
+	ackfile (d.."vprintf.c"),
+	ackfile (d.."termcap.c"),
+	ackfile (d.."getopt.c"),
+	ackfile (d.."clearerr.c"),
+	ackfile (d.."fgetc.c"),
+	ackfile (d.."fgets.c"),
+	ackfile (d.."fprintf.c"),
+	ackfile (d.."fputc.c"),
+	ackfile (d.."fputs.c"),
+	ackfile (d.."fread.c"),
+	ackfile (d.."freopen.c"),
+	ackfile (d.."fscanf.c"),
+	ackfile (d.."ftell.c"),
+	ackfile (d.."fwrite.c"),
+	ackfile (d.."getchar.c"),
+	ackfile (d.."getgrent.c"),
+	ackfile (d.."getpass.c"),
+	ackfile (d.."getpw.c"),
+	ackfile (d.."fopen.c"),
+	ackfile (d.."getpwent.c"),
+	ackfile (d.."gets.c"),
+	ackfile (d.."getw.c"),
+	ackfile (d.."popen.c"),
+	ackfile (d.."fdopen.c"),
+	ackfile (d.."printf.c"),
+	ackfile (d.."putchar.c"),
+	ackfile (d.."puts.c"),
+	ackfile (d.."putw.c"),
+	ackfile (d.."rewind.c"),
+	ackfile (d.."fseek.c"),
+	ackfile (d.."scanf.c"),
+	ackfile (d.."setbuf.c"),
+	ackfile (d.."sprintf.c"),
+	ackfile (d.."doprnt.c"),
+	ackfile (d.."fltpr.c"),
+	ackfile (d.."flushbuf.c"),
+	ackfile (d.."fclose.c"),
+	ackfile (d.."data.c"),
+	ackfile (d.."fflush.c"),
+	ackfile (d.."sscanf.c"),
+	ackfile (d.."doscan.c"),
+	ackfile (d.."fillbuf.c"),
+	ackfile (d.."system.c"),
+	ackfile (d.."timezone.c"),
+	ackfile (d.."ungetc.c"),
+
+	install = pm.install("%BINDIR%%PLATIND%/%ARCH%/tail_cc.1s.a")
+}
diff --git a/lang/cem/pmfile b/lang/cem/pmfile
new file mode 100644
index 000000000..e9453cff2
--- /dev/null
+++ b/lang/cem/pmfile
@@ -0,0 +1,8 @@
+-- $Source$
+-- $State$
+
+local d = ROOTDIR.."lang/cem/"
+
+include (d.."cemcom/pmfile")
+include (d.."cemcom.ansi/pmfile")
+include (d.."libcc/pmfile")
diff --git a/pmfile b/pmfile
index e8ebde13f..6f49839a2 100644
--- a/pmfile
+++ b/pmfile
@@ -46,8 +46,7 @@ include "util/ego/pmfile"
 include "util/topgen/pmfile"
 include "util/led/pmfile"
 
-include "lang/cem/cemcom/pmfile"
-include "lang/cem/cemcom.ansi/pmfile"
+include "lang/cem/pmfile"
 include "lang/pc/pmfile"
 include "lang/m2/pmfile"
 include "lang/occam/pmfile"
@@ -75,6 +74,7 @@ include "mach/z8000/pmfile"
 -- This is the list of language runtimes that is built for each architecture.
 
 lang_runtimes = group {
+	lang_cem_runtime,
 	lang_pc_runtime,
 	lang_m2_runtime,
 	lang_occam_runtime,
@@ -118,8 +118,8 @@ default = group {
 	tool_topgen,
 	tool_led,
 
-	lang_cem_cemcom,
-	lang_cem_cemcom_ansi,
+	lang_cem_compiler,
+	lang_cem_ansi_compiler,
 	lang_pc_compiler,
 	lang_m2_compiler,
 	lang_occam_compiler,
@@ -130,14 +130,14 @@ default = group {
 	mach_6805,
 	mach_6809,
 	mach_arm,      lang_runtimes { ARCH="arm", OPTIMISATION="-O" },
-	mach_i386,     lang_runtimes { ARCH="i386", OPTIMISATION="-O3" },
+	mach_i386,     lang_runtimes { ARCH="i386", OPTIMISATION="-O" },
 	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_i86,      lang_runtimes { ARCH="i86", OPTIMISATION="-O" },
+	mach_m68020,   lang_runtimes { ARCH="m68020", OPTIMISATION="-O" },
 --	mach_m68k2,    lang_runtimes { ARCH="m68k2", OPTIMISATION="-O" },
---	mach_m68k4,    lang_runtimes { ARCH="m68k4", OPTIMISATION="-O6" },
+--	mach_m68k4,    lang_runtimes { ARCH="m68k4", OPTIMISATION="-O" },
 	mach_ns,       lang_runtimes { ARCH="ns", OPTIMISATION="-O" },
---	mach_pdp,      lang_runtimes { ARCH="pdp", OPTIMISATION="-O6" },
+--	mach_pdp,      lang_runtimes { ARCH="pdp", OPTIMISATION="-O" },
 	mach_s2650,
 --	mach_vax4,     lang_runtimes { ARCH="vax4", OPTIMISATION="-O" },
 	mach_z80,      lang_runtimes { ARCH="z80", OPTIMISATION="-O" },
@@ -176,7 +176,10 @@ configure = simple {
 
 -- Revision history
 -- $Log$
--- Revision 1.14  2006-07-27 22:14:55  dtrg
+-- Revision 1.15  2006-07-27 22:51:38  dtrg
+-- Added support for the K&R C language runtime.
+--
+-- 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