diff --git a/README.md b/README.md
index 718e0fb3..59ff0c4e 100644
--- a/README.md
+++ b/README.md
@@ -160,6 +160,7 @@ A list of [known ITS machines](doc/machines.md).
    - MTBOOT, make bootable tapes.
    - NAME, Shows logged in users and locations, aka FINGER.
    - NETIME, network time dragon.
+   - NICNAM/NICWHO, look up someone in the ARPAnet directory.
    - OS, realtime TTY spy.
    - PALX, PDP-11 cross assembler.
    - PANDA, user account management program.
diff --git a/build/build.tcl b/build/build.tcl
index b88e6ad7..fa713e3d 100644
--- a/build/build.tcl
+++ b/build/build.tcl
@@ -727,6 +727,23 @@ respond "*" ":link sys1;ts s,sys;ts send\r"
 respond "*" ":link sys3;ts snd,sys;ts send\r"
 respond "*" ":link sys3;ts sned,sys;ts send\r"
 
+# NICNAM
+
+respond "*" ":midas sys2;ts nicnam_ar2:cstacy;nicnam\r"
+respond "Use what filename instead?" "dsk:\r"
+respond "Use what filename instead?" "dsk:\r"
+respond "Use what filename instead?" "dsk:\r"
+respond "Use what filename instead?" "dsk:\r"
+expect ":KILL"
+
+# NICWHO
+respond "*" ":midas sys2;ts nicwho_ar2:cstacy;nicwho\r"
+respond "Use what filename instead?" "dsk:\r"
+respond "Use what filename instead?" "dsk:\r"
+respond "Use what filename instead?" "dsk:\r"
+respond "Use what filename instead?" "dsk:\r"
+expect ":KILL"
+
 # reatta
 respond "*" ":midas sys1;ts reatta_sysen2;reatta\r"
 expect ":KILL"
diff --git a/src/cstacy/ar2.src2 b/src/cstacy/ar2.src2
new file mode 100755
index 00000000..0b52a632
Binary files /dev/null and b/src/cstacy/ar2.src2 differ