diff --git a/cal/README b/cal/README
index b00156b..65aeb7c 100644
--- a/cal/README
+++ b/cal/README
@@ -932,7 +932,7 @@ pi.cal
     as your free memory space and system up time allows.
 
     The piforever() function (written by Klaus Alexander Seistrup
-    <klaus@seistrup.dk>) was inspired by an algorithm conceived by
+    <klaus at seistrup dot dk>) was inspired by an algorithm conceived by
     Lambert Meertens.  See also the ABC Programmer's Handbook, by Geurts,
     Meertens & Pemberton, published by Prentice-Hall (UK) Ltd., 1990.
 
diff --git a/cal/pi.cal b/cal/pi.cal
index 16badf1..0b9ce88 100644
--- a/cal/pi.cal
+++ b/cal/pi.cal
@@ -1,7 +1,7 @@
 /*
  * pi - various routines to calculate pi
  *
- * Copyright (C) 1999-2004  David I. Bell
+ * Copyright (C) 1999-2004,2021  David I. Bell
  *
  * Calc is open software; you can redistribute it and/or modify it under
  * the terms of the version 2.1 of the GNU Lesser General Public License
@@ -74,7 +74,7 @@ define qpi(epsilon)
 /*
  * Print digits of PI forever, neatly formatted, using calc.
  *
- * Written by Klaus Alexander Seistrup <klaus@seistrup.dk>
+ * Written by Klaus Alexander Seistrup <klaus at seistrup dot dk>
  * on a dull Friday evening in November 1999.
  *
  * Inspired by an algorithm conceived by Lambert Meertens.
diff --git a/cal/qtime.cal b/cal/qtime.cal
index c2d3a95..a81d6d1 100644
--- a/cal/qtime.cal
+++ b/cal/qtime.cal
@@ -1,9 +1,9 @@
 /*
  * qtime - Display time as English sentence
  *
- * Copyright (C) 1999  Klaus Alexander Seistrup and Landon Curt Noll
+ * Copyright (C) 1999,2021  Klaus Alexander Seistrup and Landon Curt Noll
  *
- * Written by: Klaus Alexander Seistrup <kseis@magnetic-ink.dk>
+ * Written by: Klaus Alexander Seistrup <kseis at magnetic-ink dot dk>
  * With mods by: Landon Curt Noll <http://www.isthe.com/chongo/>
  *
  * Calc is open software; you can redistribute it and/or modify it under
diff --git a/calc.man b/calc.man
index 5856863..34e2f7f 100644
--- a/calc.man
+++ b/calc.man
@@ -1445,7 +1445,7 @@ Your code needs to be contributed under either the 2.1 of the
 .B GNU Lesser General Public License (LGPL 2.1)
 or be in the public domain.
 .sp
-If you do not want to use calc GitHub, then send EMail to:
+If you do not want to use calc GitHub, then send Email to:
 .sp
 .in +0.5i
 .nf
diff --git a/hist.c b/hist.c
index 3ec1f79..e13ce51 100644
--- a/hist.c
+++ b/hist.c
@@ -26,7 +26,7 @@
 /*
  * Adapted from code written by Stephen Rothwell.
  *
- * GNU readline support added by Martin Buck <mbuck@debian.org>
+ * GNU readline support added by Martin Buck <mbuck at debian dot org>
  *
  * Interactive readline module.	 This is called to read lines of input,
  * while using emacs-like editing commands within a command stack.