diff --git a/README.md b/README.md
index 57d39414..d166c613 100644
--- a/README.md
+++ b/README.md
@@ -179,6 +179,7 @@ A list of [known ITS machines](doc/machines.md).
    - PROBE, probe inside job and display various information about it.
    - PRUFD, list files on disk volume.
    - PTY, pseudo-tty.
+   - PWMAIL, a limited version of MAIL when not yet logged in under PWORD.
    - PWORD, replacement for sys;atsign hactrn that requires registered logins.
    - QUOTE, prints out a random quote.
    - REATTA, reattaches disowned jobs to terminal.
diff --git a/build/build.tcl b/build/build.tcl
index e9beafdb..94a8a831 100644
--- a/build/build.tcl
+++ b/build/build.tcl
@@ -594,7 +594,7 @@ respond "*" ":link channa;ts cnavrl,channa;rakash cnavrl\r"
 respond "*" ":link dragon;hourly cnavrl,.mail.;comsat launch\r"
 
 respond "*" ":midas sysbin;qmail_ksc;qmail\r"
-respond "PWORD version (Y or N)? " "Y\r"
+respond "PWORD version (Y or N)? " "N\r"
 expect ":KILL"
 
 respond "*" ":link sys;ts mail,sysbin;qmail bin\r"
@@ -609,6 +609,11 @@ respond "*" ":link .info.;mail info,.info.;qmail info\r"
 respond "*" ":midas sys1;ts time_sysen2;time\r"
 expect ":KILL"
 
+# PWMAIL
+respond "*" ":midas sys;ts pwmail_ksc;qmail\r"
+respond "PWORD version (Y or N)? " "Y\r"
+expect ":KILL"
+
 # lisp
 respond "*" ":link l;fasdfs 1,lisp;.fasl defs\r"
 respond "*" ":link lisp;grind fasl,lisp;gfile fasl\r"