diff --git a/build/ka10/include.tcl b/build/ka10/include.tcl
index bcfa7660..c8c34e4c 100644
--- a/build/ka10/include.tcl
+++ b/build/ka10/include.tcl
@@ -154,3 +154,7 @@ proc bootable_tapes {} {
 
 proc update_microcode {} {
 }
+
+proc clib_switches {} {
+    respond "with ^C" "\003"
+}
diff --git a/build/ks10/include.tcl b/build/ks10/include.tcl
index c729c565..f15df42a 100644
--- a/build/ks10/include.tcl
+++ b/build/ks10/include.tcl
@@ -176,3 +176,7 @@ proc update_microcode {} {
     respond "!" "quit\r"
     expect ":KILL"
 }
+
+proc clib_switches {} {
+    respond "with ^C" "KS10==1\r\003"
+}
diff --git a/build/misc.tcl b/build/misc.tcl
index 7c5c9674..0a855b34 100644
--- a/build/misc.tcl
+++ b/build/misc.tcl
@@ -1097,6 +1097,47 @@ respond "UNPURE" ":corblk pure,55107\r"
 respond "*" ":pdump c; ts cc\r"
 respond "*" ":kill\r"
 
+# CLIB
+respond "*" ":cwd clib\r"
+respond "*" ":midas c10cor cmid\r"
+respond "*" ":midas c10fo cmid\r"
+respond "*" ":midas c10int cmid\r"
+respond "*" ":midas c10mio cmid\r"
+respond "*" ":midas c10sys cmid\r"
+respond "*" ":midas alloc cmid\r"
+respond "*" ":midas blt cmid\r"
+respond "*" ":midas /t cfloat cmid\r"
+clib_switches
+respond "*" ":midas random cmid\r"
+respond "*" ":midas string cmid\r"
+respond "*" ":midas uuoh cmid\r"
+respond "*" ":midas /t c10run cmid\r"
+clib_switches
+respond "*" ":c;cc c10exp.c\r"
+respond "*" ":c;cc c10fd.c\r"
+respond "*" ":c;cc c10fil.c\r"
+respond "*" ":c;cc c10fnm.c\r"
+respond "*" ":c;cc c10io.c\r"
+respond "*" ":c;cc c10map.c\r"
+respond "*" ":c;cc c10pag.c\r"
+respond "*" ":c;cc c10tty.c\r"
+respond "*" ":c;cc ac.c\r"
+respond "*" ":c;cc apfnam.c\r"
+respond "*" ":c;cc atoi.c\r"
+respond "*" ":c;cc cprint.c\r"
+respond "*" ":c;cc date.c\r"
+respond "*" ":c;cc fprint.c\r"
+respond "*" ":c;cc match.c\r"
+respond "*" ":c;cc pr60th.c\r"
+respond "*" ":c;cc stkdmp.c\r"
+# Expect ZMAIN to be undefined, and three symbols in DATE.
+respond "*" ":stinkr mkclib\r"
+respond "*" ":c;cc maklib.c\r"
+respond "*" ":c;cc c10job.c\r"
+respond "*" ":stinkr maklib\r"
+respond "*" ":maklib\r"
+respond "*" ":delete c; \[crel\] 16\r"
+
 # TJ6
 respond "*" ":midas sysbin;_tj6;tj6\r"
 expect ":KILL"
diff --git a/src/c/clib.prglst b/src/c/clib.prglst
new file mode 120000
index 00000000..b9b2cb10
--- /dev/null
+++ b/src/c/clib.prglst
@@ -0,0 +1 @@
+clib/clib.prglst
\ No newline at end of file
diff --git a/src/c/its.bits b/src/c/its.bits
new file mode 120000
index 00000000..870fab31
--- /dev/null
+++ b/src/c/its.bits
@@ -0,0 +1 @@
+clib/its.bits
\ No newline at end of file
diff --git a/src/clib/c.defs b/src/clib/c.defs
new file mode 120000
index 00000000..64373e1d
--- /dev/null
+++ b/src/clib/c.defs
@@ -0,0 +1 @@
+c/c.defs
\ No newline at end of file
diff --git a/src/clib/clib.prglst b/src/clib/clib.prglst
index abd960da..0b27f699 100644
--- a/src/clib/clib.prglst
+++ b/src/clib/clib.prglst
@@ -9,39 +9,38 @@
 
 ; The following are ITS- dependent files from C10LIB:
 
-l clib;c10cor
-l clib;c10exp
-l clib;c10fd
-l clib;c10fil
-l clib;c10fnm
-l clib;c10fo
-l clib;c10int
-l clib;c10io
-l clib;c10map
-l clib;c10mio
-l clib;c10pag
-l clib;c10sys
-l clib;c10tty
+l clib;c10cor stk
+l clib;c10exp stk
+l clib;c10fd stk
+l clib;c10fil stk
+l clib;c10fnm stk
+l clib;c10fo stk
+l clib;c10int stk
+l clib;c10io stk
+l clib;c10map stk
+l clib;c10mio stk
+l clib;c10pag stk
+l clib;c10sys stk
+l clib;c10tty stk
 
 ; The following are ITS-independent files from CLIB:
 
-l clib;ac
-l clib;alloc
-l clib;apfnam
-l clib;atoi
-l clib;blt
-l clib;cfloat
-l clib;cprint
-l clib;date
-l clib;fprint
-l clib;match
-l clib;pr60th
-l clib;random
-l clib;stkdmp
-l clib;string
-l clib;uuoh
+l clib;ac stk
+l clib;alloc stk
+l clib;apfnam stk
+l clib;atoi stk
+l clib;blt stk
+l clib;cfloat stk
+l clib;cprint stk
+l clib;date stk
+l clib;fprint stk
+l clib;match stk
+l clib;pr60th stk
+l clib;random stk
+l clib;stkdmp stk
+l clib;string stk
+l clib;uuoh stk
 
 ; This must be last:
 
-l clib;c10run
-
\ No newline at end of file
+l clib;c10run stk
diff --git a/src/clib/maklib.stinkr b/src/clib/maklib.stinkr
index eaec674d..066acc74 100644
--- a/src/clib/maklib.stinkr
+++ b/src/clib/maklib.stinkr
@@ -1,7 +1,4 @@
-x clib
-l maklib
-l apfnam
-l c10job
-l c10fnm
+x c/clib
+l maklib.stk
+l c10job.stk
 o ts maklib
-
\ No newline at end of file
diff --git a/src/clib/nc.insert b/src/clib/nc.insert
new file mode 120000
index 00000000..bbb9532d
--- /dev/null
+++ b/src/clib/nc.insert
@@ -0,0 +1 @@
+c/nc.insert
\ No newline at end of file
diff --git a/src/clib/nm.insert b/src/clib/nm.insert
new file mode 120000
index 00000000..cf14ab09
--- /dev/null
+++ b/src/clib/nm.insert
@@ -0,0 +1 @@
+c/nm.insert
\ No newline at end of file