143 files changed, 157 insertions, 241 deletions

diff --git a/UPDATING b/UPDATING
index 649ea8f5203dd..8ae17727d2878 100644
--- a/UPDATING
+++ b/UPDATING
@@ -2120,7 +2120,7 @@ to fetch an UPDATING file from an older FreeBSD release.
 
 Copyright information:
 
-Copyright 1998-2009 M. Warner Losh.
+Copyright 1998-2009 M. Warner Losh <imp@FreeBSD.org>
 
 Redistribution, publication, translation and use, with or without
 modification, in full or in part, in any form or format of this
diff --git a/lib/libc/stdlib/reallocf.c b/lib/libc/stdlib/reallocf.c
index 470d55bd736c4..9cebfd0c95199 100644
--- a/lib/libc/stdlib/reallocf.c
+++ b/lib/libc/stdlib/reallocf.c
@@ -1,8 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 1998, M. Warner Losh <imp@freebsd.org>
- * All rights reserved.
+ * Copyright (c) 1998 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/lib/libc/sys/compat-ino64.h b/lib/libc/sys/compat-ino64.h
index dde741e4f0890..009efd63c5901 100644
--- a/lib/libc/sys/compat-ino64.h
+++ b/lib/libc/sys/compat-ino64.h
@@ -1,6 +1,5 @@
 /*-
  * Copyright (c) 2017 M. Warner Losh <imp@FreeBSD.org>
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/lib/libc/sys/fstat.c b/lib/libc/sys/fstat.c
index a57a8aad52a20..d31b1f54bb11c 100644
--- a/lib/libc/sys/fstat.c
+++ b/lib/libc/sys/fstat.c
@@ -1,6 +1,5 @@
 /*-
  * Copyright (c) 2017 M. Warner Losh <imp@FreeBSD.org>
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/lib/libc/sys/fstatat.c b/lib/libc/sys/fstatat.c
index 5e6edccdb97de..104f22ee16bd5 100644
--- a/lib/libc/sys/fstatat.c
+++ b/lib/libc/sys/fstatat.c
@@ -1,6 +1,5 @@
 /*-
  * Copyright (c) 2017 M. Warner Losh <imp@FreeBSD.org>
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/lib/libc/sys/fstatfs.c b/lib/libc/sys/fstatfs.c
index 71ee12dc0bfb9..836127842c4a4 100644
--- a/lib/libc/sys/fstatfs.c
+++ b/lib/libc/sys/fstatfs.c
@@ -1,6 +1,5 @@
 /*-
  * Copyright (c) 2017 M. Warner Losh <imp@FreeBSD.org>
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/lib/libc/sys/getdirentries.c b/lib/libc/sys/getdirentries.c
index 469e6d26d790f..5a94c6096d593 100644
--- a/lib/libc/sys/getdirentries.c
+++ b/lib/libc/sys/getdirentries.c
@@ -1,6 +1,5 @@
 /*-
  * Copyright (c) 2017 M. Warner Losh <imp@FreeBSD.org>
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/lib/libc/sys/getfsstat.c b/lib/libc/sys/getfsstat.c
index ca81f3e9fd52e..edbfaa989b5a9 100644
--- a/lib/libc/sys/getfsstat.c
+++ b/lib/libc/sys/getfsstat.c
@@ -1,6 +1,5 @@
 /*-
  * Copyright (c) 2017 M. Warner Losh <imp@FreeBSD.org>
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/lib/libc/sys/lstat.c b/lib/libc/sys/lstat.c
index d639a42d3dd03..4b7e0b1bf2b89 100644
--- a/lib/libc/sys/lstat.c
+++ b/lib/libc/sys/lstat.c
@@ -1,7 +1,6 @@
 /*-
+ * Copyright (c) 2012 Gleb Kurtsou <gleb@FreeBSD.org> All rights reserved.
  * Copyright (c) 2017 M. Warner Losh <imp@FreeBSD.org>
- * Copyright (c) 2012 Gleb Kurtsou <gleb@FreeBSD.org>
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/lib/libc/sys/stat.c b/lib/libc/sys/stat.c
index a7ed7baf5c2f8..f4f0289b2bd64 100644
--- a/lib/libc/sys/stat.c
+++ b/lib/libc/sys/stat.c
@@ -1,7 +1,6 @@
 /*-
+ * Copyright (c) 2012 Gleb Kurtsou <gleb@FreeBSD.org> All rights reserved.
  * Copyright (c) 2017 M. Warner Losh <imp@FreeBSD.org>
- * Copyright (c) 2012 Gleb Kurtsou <gleb@FreeBSD.org>
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/lib/libc/sys/statfs.c b/lib/libc/sys/statfs.c
index 63774e999d928..f7d4d7752c4a1 100644
--- a/lib/libc/sys/statfs.c
+++ b/lib/libc/sys/statfs.c
@@ -1,6 +1,5 @@
 /*-
  * Copyright (c) 2017 M. Warner Losh <imp@FreeBSD.org>
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/libexec/rc/rc.d/devmatch b/libexec/rc/rc.d/devmatch
index 234aaf6dae0ef..baad83a68fb67 100755
--- a/libexec/rc/rc.d/devmatch
+++ b/libexec/rc/rc.d/devmatch
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2018 M. Warner Losh
+# Copyright (c) 2018 M. Warner Losh <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/libexec/talkd/extern.h b/libexec/talkd/extern.h
index 3314ebbbbfde6..f81efe721029a 100644
--- a/libexec/talkd/extern.h
+++ b/libexec/talkd/extern.h
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2002 M. Warner Losh.
+ * Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/devd/devd.8 b/sbin/devd/devd.8
index 7faf188bd40bb..fa05db734b883 100644
--- a/sbin/devd/devd.8
+++ b/sbin/devd/devd.8
@@ -1,6 +1,5 @@
 .\"
-.\" Copyright (c) 2002 M. Warner Losh.
-.\" All rights reserved.
+.\" Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc
index b2d08324511f3..afd57d452f060 100644
--- a/sbin/devd/devd.cc
+++ b/sbin/devd/devd.cc
@@ -1,8 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-3-Clause AND BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2002-2010 M. Warner Losh.
- * All rights reserved.
+ * Copyright (c) 2002-2010 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/devd/devd.conf.5 b/sbin/devd/devd.conf.5
index ade9ede352756..ca1ee38e1783b 100644
--- a/sbin/devd/devd.conf.5
+++ b/sbin/devd/devd.conf.5
@@ -1,6 +1,5 @@
 .\"
-.\" Copyright (c) 2002 M. Warner Losh
-.\" All rights reserved.
+.\" Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/sbin/devd/devd.h b/sbin/devd/devd.h
index ca2903ce3857f..a291e81412986 100644
--- a/sbin/devd/devd.h
+++ b/sbin/devd/devd.h
@@ -3,8 +3,7 @@
  *
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2002 M. Warner Losh <imp@freebsd.org>.
- * All rights reserved.
+ * Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/devd/devd.hh b/sbin/devd/devd.hh
index d770da22226a3..62511d8ec3a54 100644
--- a/sbin/devd/devd.hh
+++ b/sbin/devd/devd.hh
@@ -1,8 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2002-2003 M. Warner Losh.
- * All rights reserved.
+ * Copyright (c) 2002-2003 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/devd/parse.y b/sbin/devd/parse.y
index ae5cbdfae82da..9b8fd592045ae 100644
--- a/sbin/devd/parse.y
+++ b/sbin/devd/parse.y
@@ -4,8 +4,7 @@
  *
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2002 M. Warner Losh <imp@freebsd.org>.
- * All rights reserved.
+ * Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sbin/devd/token.l b/sbin/devd/token.l
index 7f11f8ef07489..30e48e815fe30 100644
--- a/sbin/devd/token.l
+++ b/sbin/devd/token.l
@@ -4,8 +4,7 @@
  *
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2002 M. Warner Losh <imp@freebsd.org>.
- * All rights reserved.
+ * Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/share/man/man4/cardbus.4 b/share/man/man4/cardbus.4
index 1c3600a916834..ddd886dde9bb3 100644
--- a/share/man/man4/cardbus.4
+++ b/share/man/man4/cardbus.4
@@ -1,6 +1,5 @@
 .\"
-.\" Copyright (c) 2002 M. Warner Losh
-.\" All rights reserved.
+.\" Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/devctl.4 b/share/man/man4/devctl.4
index f71d029a32e93..dc035f1246d25 100644
--- a/share/man/man4/devctl.4
+++ b/share/man/man4/devctl.4
@@ -1,6 +1,5 @@
 .\"
-.\" Copyright (c) 2002 M. Warner Losh
-.\" All rights reserved.
+.\" Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/exca.4 b/share/man/man4/exca.4
index 90b13307fdd31..d659593b577dc 100644
--- a/share/man/man4/exca.4
+++ b/share/man/man4/exca.4
@@ -1,6 +1,5 @@
 .\"
-.\" Copyright (c) 2003 M. Warner Losh
-.\" All rights reserved.
+.\" Copyright (c) 2003 M. Warner Losh <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/iic.4 b/share/man/man4/iic.4
index a63a039702ef7..77a8177e5d1bd 100644
--- a/share/man/man4/iic.4
+++ b/share/man/man4/iic.4
@@ -1,6 +1,5 @@
-.\" Copyright (c) 2006, M. Warner Losh
-.\" Copyright (c) 1998, Nicolas Souchu
-.\" All rights reserved.
+.\" Copyright (c) 1998, Nicolas Souchu All rights reserved.
+.\" Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/mmc.4 b/share/man/man4/mmc.4
index 184ac90cddf8b..49f333135adee 100644
--- a/share/man/man4/mmc.4
+++ b/share/man/man4/mmc.4
@@ -1,6 +1,5 @@
 .\"
-.\" Copyright (c) 2007 M. Warner Losh
-.\" All rights reserved.
+.\" Copyright (c) 2007 M. Warner Losh <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/mmcsd.4 b/share/man/man4/mmcsd.4
index a0bcbcd9da2c4..e66867eb3453c 100644
--- a/share/man/man4/mmcsd.4
+++ b/share/man/man4/mmcsd.4
@@ -1,6 +1,5 @@
 .\"
-.\" Copyright (c) 2007 M. Warner Losh
-.\" All rights reserved.
+.\" Copyright (c) 2007 M. Warner Losh <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/ow.4 b/share/man/man4/ow.4
index fde2ef5fad091..425b891a0c24c 100644
--- a/share/man/man4/ow.4
+++ b/share/man/man4/ow.4
@@ -1,6 +1,5 @@
 .\"
-.\" Copyright (c) 2015 M. Warner Losh
-.\" All rights reserved.
+.\" Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/ow_temp.4 b/share/man/man4/ow_temp.4
index eaaf3c56c298e..291bb0ce471df 100644
--- a/share/man/man4/ow_temp.4
+++ b/share/man/man4/ow_temp.4
@@ -1,6 +1,5 @@
 .\"
-.\" Copyright (c) 2015 M. Warner Losh
-.\" All rights reserved.
+.\" Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/owc.4 b/share/man/man4/owc.4
index 06c4e909ac96b..f1fbd4f3c8db1 100644
--- a/share/man/man4/owc.4
+++ b/share/man/man4/owc.4
@@ -1,6 +1,5 @@
 .\"
-.\" Copyright (c) 2015 M. Warner Losh
-.\" All rights reserved.
+.\" Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/pccard.4 b/share/man/man4/pccard.4
index f955804978e25..df37c4eae198f 100644
--- a/share/man/man4/pccard.4
+++ b/share/man/man4/pccard.4
@@ -1,6 +1,5 @@
 .\"
-.\" Copyright (c) 2002 M. Warner Losh
-.\" All rights reserved.
+.\" Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/pccbb.4 b/share/man/man4/pccbb.4
index 6018bec7b64d0..0feabfb41370c 100644
--- a/share/man/man4/pccbb.4
+++ b/share/man/man4/pccbb.4
@@ -1,6 +1,5 @@
 .\"
-.\" Copyright (c) 2002-2003 M. Warner Losh
-.\" All rights reserved.
+.\" Copyright (c) 2002-2003 M. Warner Losh <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/pcib.4 b/share/man/man4/pcib.4
index e57b66c97ace0..22efe2f3e1cbd 100644
--- a/share/man/man4/pcib.4
+++ b/share/man/man4/pcib.4
@@ -1,6 +1,5 @@
 .\"
-.\" Copyright (c) 2008 M. Warner Losh
-.\" All rights reserved.
+.\" Copyright (c) 2008 M. Warner Losh <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/pcic.4 b/share/man/man4/pcic.4
index 589a2ed5c9a05..045b543b41894 100644
--- a/share/man/man4/pcic.4
+++ b/share/man/man4/pcic.4
@@ -1,6 +1,5 @@
 .\"
-.\" Copyright (c) 2001, 2002 M. Warner Losh
-.\" All rights reserved.
+.\" Copyright (c) 2001-2002 M. Warner Losh <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man4/ufm.4 b/share/man/man4/ufm.4
index a06d45cfd3558..9901fe7c6b25c 100644
--- a/share/man/man4/ufm.4
+++ b/share/man/man4/ufm.4
@@ -1,5 +1,4 @@
-.\" Copyright (c) 2003 M. Warner Losh
-.\" 	<imp@FreeBSD.org>. All rights reserved.
+.\" Copyright (c) 2003 M. Warner Losh <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/share/man/man5/os-release.5 b/share/man/man5/os-release.5
index 0ad154859e3e0..ab56e477cf3d4 100644
--- a/share/man/man5/os-release.5
+++ b/share/man/man5/os-release.5
@@ -1,4 +1,5 @@
-.\" Copyright (c) 2019 M. Warner Losh.
+.\"
+.\" Copyright (c) 2019 M. Warner Losh <imp@FreeBSD.org>
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/stand/common/paths.h b/stand/common/paths.h
index b323137701292..ed30abda49037 100644
--- a/stand/common/paths.h
+++ b/stand/common/paths.h
@@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2016 M. Warner Losh <imp@freebsd.org>
- * All rights reserved.
+ * Copyright (c) 2016 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/stand/common/zfs_cmd.c b/stand/common/zfs_cmd.c
index cb98f7256268f..5f27f76b7885d 100644
--- a/stand/common/zfs_cmd.c
+++ b/stand/common/zfs_cmd.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2018 M. Warner Losh <imp@freebd.org>
+ * Copyright (c) 2018 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/stand/liblua/float.h b/stand/liblua/float.h
index c37bbaa29f01f..fa958597bb55e 100644
--- a/stand/liblua/float.h
+++ b/stand/liblua/float.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2018 M. Warner Losh
+ * Copyright (c) 2018 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/stand/liblua/locale.h b/stand/liblua/locale.h
index d082202582141..b6420935d83fd 100644
--- a/stand/liblua/locale.h
+++ b/stand/liblua/locale.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2018 M. Warner Losh
+ * Copyright (c) 2018 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/stand/liblua/math.h b/stand/liblua/math.h
index 8d95a6ebc560e..c29466f1af49d 100644
--- a/stand/liblua/math.h
+++ b/stand/liblua/math.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2018 M. Warner Losh
+ * Copyright (c) 2018 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/stand/libsa/uuid_from_string.c b/stand/libsa/uuid_from_string.c
index 7a59b4189ead9..b28e204b27393 100644
--- a/stand/libsa/uuid_from_string.c
+++ b/stand/libsa/uuid_from_string.c
@@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2015 M. Warner Losh
- * All rights reserved.
+ * Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/stand/libsa/uuid_to_string.c b/stand/libsa/uuid_to_string.c
index d878af495aca9..68d3d73515dd1 100644
--- a/stand/libsa/uuid_to_string.c
+++ b/stand/libsa/uuid_to_string.c
@@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2015 M. Warner Losh
- * All rights reserved.
+ * Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/amd64/include/_bus.h b/sys/amd64/include/_bus.h
index 73482b452e650..a437489bf1daf 100644
--- a/sys/amd64/include/_bus.h
+++ b/sys/amd64/include/_bus.h
@@ -1,8 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2005 M. Warner Losh.
- * All rights reserved.
+ * Copyright (c) 2005 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/arm/allwinner/a10_ahci.c b/sys/arm/allwinner/a10_ahci.c
index 7e149e2dd9ee3..73e722ea16949 100644
--- a/sys/arm/allwinner/a10_ahci.c
+++ b/sys/arm/allwinner/a10_ahci.c
@@ -1,7 +1,6 @@
 /*-
- * Copyright (c) 2014-2015 M. Warner Losh <imp@freebsd.org>
- * Copyright (c) 2015 Luiz Otavio O Souza <loos@freebsd.org>
- * All rights reserved.
+ * Copyright (c) 2015 Luiz Otavio O Souza <loos@freebsd.org> All rights reserved.
+ * Copyright (c) 2014-2015 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/arm/conf/genboardid.awk b/sys/arm/conf/genboardid.awk
index 03338ad9e697e..f07993b1ef8eb 100644
--- a/sys/arm/conf/genboardid.awk
+++ b/sys/arm/conf/genboardid.awk
@@ -4,7 +4,7 @@
 #-
 # SPDX-License-Identifier: BSD-2-Clause-FreeBSD
 #
-# Copyright (c) 2012 M. Warner Losh.
+# Copyright (c) 2012 M. Warner Losh <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/sys/arm/include/_bus.h b/sys/arm/include/_bus.h
index 9bb51e989fffe..803dda2e27638 100644
--- a/sys/arm/include/_bus.h
+++ b/sys/arm/include/_bus.h
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2005 M. Warner Losh.
+ * Copyright (c) 2005 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/arm/include/atags.h b/sys/arm/include/atags.h
index 91d52ed28a5b0..baf39b5c0c699 100644
--- a/sys/arm/include/atags.h
+++ b/sys/arm/include/atags.h
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2012 M. Warner Losh.
+ * Copyright (c) 2012 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/arm/include/board.h b/sys/arm/include/board.h
index 82a06b3795c58..62554a5d68eef 100644
--- a/sys/arm/include/board.h
+++ b/sys/arm/include/board.h
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2012 M. Warner Losh.
+ * Copyright (c) 2012 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/arm/xilinx/uart_dev_cdnc.c b/sys/arm/xilinx/uart_dev_cdnc.c
index 05fde412f7c93..1dc2b584e97ff 100644
--- a/sys/arm/xilinx/uart_dev_cdnc.c
+++ b/sys/arm/xilinx/uart_dev_cdnc.c
@@ -1,10 +1,9 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2005 M. Warner Losh
- * Copyright (c) 2005 Olivier Houchard
- * Copyright (c) 2012 Thomas Skibo
- * All rights reserved.
+ * Copyright (c) 2005 Olivier Houchard All rights reserved.
+ * Copyright (c) 2012 Thomas Skibo All rights reserved.
+ * Copyright (c) 2005 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/arm64/include/_bus.h b/sys/arm64/include/_bus.h
index f11991f65ed4f..e2d3069323d56 100644
--- a/sys/arm64/include/_bus.h
+++ b/sys/arm64/include/_bus.h
@@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2005 M. Warner Losh.
- * All rights reserved.
+ * Copyright (c) 2005 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/cam/mmc/mmc_da.c b/sys/cam/mmc/mmc_da.c
index d0a3b35c0b457..b5f8a106c6796 100644
--- a/sys/cam/mmc/mmc_da.c
+++ b/sys/cam/mmc/mmc_da.c
@@ -1,11 +1,10 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2006 Bernd Walter <tisco@FreeBSD.org>
+ * Copyright (c) 2006 Bernd Walter <tisco@FreeBSD.org> All rights reserved.
+ * Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org> All rights reserved.
+ * Copyright (c) 2015-2017 Ilya Bakulin <kibab@FreeBSD.org> All rights reserved.
  * Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
- * Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
- * Copyright (c) 2015-2017 Ilya Bakulin <kibab@FreeBSD.org>
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index 938e9b13459a4..8f20a6c81fef1 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -2,8 +2,7 @@
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Copyright (c) 2000,2001 Jonathan Chen.  All rights reserved.
- *
- * Copyright (c) 2003-2008 M. Warner Losh.
+ * Copyright (c) 2003-2008 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/cardbus/cardbus_cis.c b/sys/dev/cardbus/cardbus_cis.c
index 83442c2d0d4a8..17161e22248cc 100644
--- a/sys/dev/cardbus/cardbus_cis.c
+++ b/sys/dev/cardbus/cardbus_cis.c
@@ -1,9 +1,9 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2005-2008, M. Warner Losh
- * Copyright (c) 2000,2001 Jonathan Chen.
- * All rights reserved.
+ * Copyright (c) 2000,2001 Jonathan Chen All rights reserved.
+ * Copyright (c) 2005-2008 M. Warner Losh <imp@FreeBSD.org>
+ * 
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/cardbus/cardbus_device.c b/sys/dev/cardbus/cardbus_device.c
index de0a53a93f21d..0de25572fa9c5 100644
--- a/sys/dev/cardbus/cardbus_device.c
+++ b/sys/dev/cardbus/cardbus_device.c
@@ -1,8 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2005-2008, M. Warner Losh
- * All rights reserved.
+ * Copyright (c) 2005-2008 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/cardbus/cardbusvar.h b/sys/dev/cardbus/cardbusvar.h
index 310923655a196..a8aa8f0aa576b 100644
--- a/sys/dev/cardbus/cardbusvar.h
+++ b/sys/dev/cardbus/cardbusvar.h
@@ -1,9 +1,8 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2008, M. Warner Losh
- * Copyright (c) 2000,2001 Jonathan Chen.
- * All rights reserved.
+ * Copyright (c) 2000,2001 Jonathan Chen. All rights reserved.
+ * Copyright (c) 2008 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/exca/exca.c b/sys/dev/exca/exca.c
index 060e0a548c95a..f73da8345d185 100644
--- a/sys/dev/exca/exca.c
+++ b/sys/dev/exca/exca.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2002-2005 M. Warner Losh.
+ * Copyright (c) 2002-2005 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/exca/excareg.h b/sys/dev/exca/excareg.h
index 547d53122f8a8..ac7a064b36835 100644
--- a/sys/dev/exca/excareg.h
+++ b/sys/dev/exca/excareg.h
@@ -4,7 +4,7 @@
 /*-
  * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2002 M. Warner Losh.
+ * Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/exca/excavar.h b/sys/dev/exca/excavar.h
index 4e0fa61e727de..2b52e1ac16e4b 100644
--- a/sys/dev/exca/excavar.h
+++ b/sys/dev/exca/excavar.h
@@ -3,7 +3,7 @@
 /*-
  * SPDX-License-Identifier: BSD-4-Clause AND BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2002 M. Warner Losh.
+ * Copyright (c) 2002 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/fdc/fdc_isa.c b/sys/dev/fdc/fdc_isa.c
index ab03c78a691e6..6b22c05fb85ea 100644
--- a/sys/dev/fdc/fdc_isa.c
+++ b/sys/dev/fdc/fdc_isa.c
@@ -1,8 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2004-2005 M. Warner Losh.
- * All rights reserved.
+ * Copyright (c) 2004-2005 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/fdc/fdc_pccard.c b/sys/dev/fdc/fdc_pccard.c
index 2b7a3196f2af4..364e2104b6480 100644
--- a/sys/dev/fdc/fdc_pccard.c
+++ b/sys/dev/fdc/fdc_pccard.c
@@ -1,8 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2004-2005 M. Warner Losh.
- * All rights reserved.
+ * Copyright (c) 2004-2005 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/fdc/fdcvar.h b/sys/dev/fdc/fdcvar.h
index f492d09498791..3a2159db13485 100644
--- a/sys/dev/fdc/fdcvar.h
+++ b/sys/dev/fdc/fdcvar.h
@@ -1,8 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2004-2005 M. Warner Losh.
- * All rights reserved.
+ * Copyright (c) 2004-2005 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/flash/at45d.c b/sys/dev/flash/at45d.c
index 4704dc500f4ba..c5339576c3d1d 100644
--- a/sys/dev/flash/at45d.c
+++ b/sys/dev/flash/at45d.c
@@ -1,11 +1,10 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2006 M. Warner Losh
- * Copyright (c) 2011-2012 Ian Lepore
- * Copyright (c) 2012 Marius Strobl <marius@FreeBSD.org>
- * All rights reserved.
- *
+ * Copyright (c) 2011-2012 Ian Lepore All rights reserved.
+ * Copyright (c) 2012 Marius Strobl <marius@FreeBSD.org> All rights reserved.
+ * Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
+
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/sys/dev/flash/mx25l.c b/sys/dev/flash/mx25l.c
index 373b09a31b8ae..3d146882eea74 100644
--- a/sys/dev/flash/mx25l.c
+++ b/sys/dev/flash/mx25l.c
@@ -1,9 +1,9 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2006 M. Warner Losh.
  * Copyright (c) 2009 Oleksandr Tymoshenko.  All rights reserved.
  * Copyright (c) 2018 Ian Lepore.  All rights reserved.
+ * Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/flash/n25q.c b/sys/dev/flash/n25q.c
index 428e998f41a50..b885da983fcbe 100644
--- a/sys/dev/flash/n25q.c
+++ b/sys/dev/flash/n25q.c
@@ -1,9 +1,8 @@
 /*-
- * Copyright (c) 2006 M. Warner Losh.
  * Copyright (c) 2009 Oleksandr Tymoshenko.  All rights reserved.
  * Copyright (c) 2017 Ruslan Bukin <br@bsdpad.com>
  * Copyright (c) 2018 Ian Lepore.  All rights reserved.
- * All rights reserved.
+ * Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
  *
  * This software was developed by SRI International and the University of
  * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237
diff --git a/sys/dev/iicbus/icee.c b/sys/dev/iicbus/icee.c
index 0f6ab4d0700a9..18cf8e9bd5296 100644
--- a/sys/dev/iicbus/icee.c
+++ b/sys/dev/iicbus/icee.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2006 M. Warner Losh.
+ * Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/mii/axphy.c b/sys/dev/mii/axphy.c
index 34192f11f842c..2e32486f1eeaf 100644
--- a/sys/dev/mii/axphy.c
+++ b/sys/dev/mii/axphy.c
@@ -1,8 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2009, M. Warner Losh
- * All rights reserved.
+ * Copyright (c) 2009 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/mmc/bridge.h b/sys/dev/mmc/bridge.h
index d32abbacedb96..5fbe11663708d 100644
--- a/sys/dev/mmc/bridge.h
+++ b/sys/dev/mmc/bridge.h
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2006 M. Warner Losh.
+ * Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/mmc/mmc.c b/sys/dev/mmc/mmc.c
index 4b77fc48c482f..5a318ffe8c68e 100644
--- a/sys/dev/mmc/mmc.c
+++ b/sys/dev/mmc/mmc.c
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Copyright (c) 2006 Bernd Walter.  All rights reserved.
- * Copyright (c) 2006 M. Warner Losh.
+ * Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
  * Copyright (c) 2017 Marius Strobl <marius@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mmc/mmc_private.h b/sys/dev/mmc/mmc_private.h
index a633d23555047..4e969402aa7a1 100644
--- a/sys/dev/mmc/mmc_private.h
+++ b/sys/dev/mmc/mmc_private.h
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Bernd Walter.  All rights reserved.
- * Copyright (c) 2006 M. Warner Losh.
+ * Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/mmc/mmc_subr.c b/sys/dev/mmc/mmc_subr.c
index 6469e76c66144..53c9009c6e649 100644
--- a/sys/dev/mmc/mmc_subr.c
+++ b/sys/dev/mmc/mmc_subr.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Bernd Walter.  All rights reserved.
- * Copyright (c) 2006 M. Warner Losh.
+ * Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/mmc/mmc_subr.h b/sys/dev/mmc/mmc_subr.h
index 80c1ce2fad254..14c3c5b94ee40 100644
--- a/sys/dev/mmc/mmc_subr.h
+++ b/sys/dev/mmc/mmc_subr.h
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2006 Bernd Walter.  All rights reserved.
- * Copyright (c) 2006 M. Warner Losh.
+ * Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/mmc/mmcbr_if.m b/sys/dev/mmc/mmcbr_if.m
index 497ff3acca27f..72f712d75948a 100644
--- a/sys/dev/mmc/mmcbr_if.m
+++ b/sys/dev/mmc/mmcbr_if.m
@@ -1,6 +1,5 @@
 #-
-# Copyright (c) 2006 M. Warner Losh
-# All rights reserved.
+# Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/sys/dev/mmc/mmcbrvar.h b/sys/dev/mmc/mmcbrvar.h
index b05c029dff9f6..90095710dbb12 100644
--- a/sys/dev/mmc/mmcbrvar.h
+++ b/sys/dev/mmc/mmcbrvar.h
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Copyright (c) 2006 Bernd Walter.  All rights reserved.
- * Copyright (c) 2006 M. Warner Losh.
+ * Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/mmc/mmcbus_if.m b/sys/dev/mmc/mmcbus_if.m
index b55f26486e5e6..d3e6d7276ea89 100644
--- a/sys/dev/mmc/mmcbus_if.m
+++ b/sys/dev/mmc/mmcbus_if.m
@@ -1,6 +1,5 @@
 #-
-# Copyright (c) 2006 M. Warner Losh
-# All rights reserved.
+# Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/sys/dev/mmc/mmcreg.h b/sys/dev/mmc/mmcreg.h
index b78b2078c6fe2..8fc6ba06ff876 100644
--- a/sys/dev/mmc/mmcreg.h
+++ b/sys/dev/mmc/mmcreg.h
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2006 M. Warner Losh.
+ * Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
  * Copyright (c) 2017 Marius Strobl <marius@FreeBSD.org>
  * Copyright (c) 2015-2016 Ilya Bakulin <kibab@FreeBSD.org>
  *
diff --git a/sys/dev/mmc/mmcsd.c b/sys/dev/mmc/mmcsd.c
index 4743ffd6b4943..dcb8290b821ee 100644
--- a/sys/dev/mmc/mmcsd.c
+++ b/sys/dev/mmc/mmcsd.c
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Copyright (c) 2006 Bernd Walter.  All rights reserved.
- * Copyright (c) 2006 M. Warner Losh.
+ * Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
  * Copyright (c) 2017 Marius Strobl <marius@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/sys/dev/mmc/mmcvar.h b/sys/dev/mmc/mmcvar.h
index 8d8c5547f3cda..1714f73e3dda3 100644
--- a/sys/dev/mmc/mmcvar.h
+++ b/sys/dev/mmc/mmcvar.h
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Copyright (c) 2006 Bernd Walter.  All rights reserved.
- * Copyright (c) 2006 M. Warner Losh.
+ * Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/ow/ow.c b/sys/dev/ow/ow.c
index 4f3e570088ca1..c598be3a4a68e 100644
--- a/sys/dev/ow/ow.c
+++ b/sys/dev/ow/ow.c
@@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2015 M. Warner Losh <imp@freebsd.org>
- * All rights reserved.
+ * Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/ow/ow.h b/sys/dev/ow/ow.h
index 359f86fe75d42..18621e741536c 100644
--- a/sys/dev/ow/ow.h
+++ b/sys/dev/ow/ow.h
@@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2015 M. Warner Losh <imp@freebsd.org>
- * All rights reserved.
+ * Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/ow/ow_temp.c b/sys/dev/ow/ow_temp.c
index 58783949961ca..cd0a61838064f 100644
--- a/sys/dev/ow/ow_temp.c
+++ b/sys/dev/ow/ow_temp.c
@@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2015 M. Warner Losh <imp@freebsd.org>
- * All rights reserved.
+ * Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/ow/owc_gpiobus.c b/sys/dev/ow/owc_gpiobus.c
index eff2243f91ebf..0ed6ca1051409 100644
--- a/sys/dev/ow/owc_gpiobus.c
+++ b/sys/dev/ow/owc_gpiobus.c
@@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2015 M. Warner Losh <imp@freebsd.org>
- * All rights reserved.
+ * Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/ow/owll.h b/sys/dev/ow/owll.h
index ba2572a0b66e9..a601e8ed82621 100644
--- a/sys/dev/ow/owll.h
+++ b/sys/dev/ow/owll.h
@@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2015 M. Warner Losh <imp@freebsd.org>
- * All rights reserved.
+ * Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/ow/owll_if.m b/sys/dev/ow/owll_if.m
index 4dd0793562ebd..22e237cea1232 100644
--- a/sys/dev/ow/owll_if.m
+++ b/sys/dev/ow/owll_if.m
@@ -1,6 +1,5 @@
 #-
-# Copyright (c) 2015 M. Warner Losh <imp@freebsd.org>
-# All rights reserved.
+# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/sys/dev/ow/own.h b/sys/dev/ow/own.h
index 769730f4037ca..c7cc441168d3d 100644
--- a/sys/dev/ow/own.h
+++ b/sys/dev/ow/own.h
@@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2015 M. Warner Losh <imp@freebsd.org>
- * All rights reserved.
+ * Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/ow/own_if.m b/sys/dev/ow/own_if.m
index 583bace4c272a..e4b4bb8d7c749 100644
--- a/sys/dev/ow/own_if.m
+++ b/sys/dev/ow/own_if.m
@@ -1,6 +1,5 @@
 #-
-# Copyright (c) 2015 M. Warner Losh <imp@freebsd.org>
-# All rights reserved.
+# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/sys/dev/pccard/card_if.m b/sys/dev/pccard/card_if.m
index 606af16b3e597..e1b816807a489 100644
--- a/sys/dev/pccard/card_if.m
+++ b/sys/dev/pccard/card_if.m
@@ -1,6 +1,5 @@
 #-
-# Copyright (c) 1999 M. Warner Losh.
-# All rights reserved.
+# Copyright (c) 1999 M. Warner Losh <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/sys/dev/pccard/pccard_device.c b/sys/dev/pccard/pccard_device.c
index 844422b54d576..8b476a4074f45 100644
--- a/sys/dev/pccard/pccard_device.c
+++ b/sys/dev/pccard/pccard_device.c
@@ -1,8 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2005, M. Warner Losh
- * All rights reserved.
+ * Copyright (c) 2005 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/pccard/pccardvarp.h b/sys/dev/pccard/pccardvarp.h
index 89890c00bed27..16d7c07ac4ba6 100644
--- a/sys/dev/pccard/pccardvarp.h
+++ b/sys/dev/pccard/pccardvarp.h
@@ -1,8 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2005, M. Warner Losh
- * All rights reserved.
+ * Copyright (c) 2005 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/pccard/power_if.m b/sys/dev/pccard/power_if.m
index a85fd01e50e00..b1067bda2b904 100644
--- a/sys/dev/pccard/power_if.m
+++ b/sys/dev/pccard/power_if.m
@@ -1,6 +1,5 @@
 #-
-# Copyright (c) 1999 M. Warner Losh.
-# All rights reserved.
+# Copyright (c) 1999 M. Warner Losh <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c
index c4fcd2af06e6a..1b7c2f1ea9f48 100644
--- a/sys/dev/pccbb/pccbb.c
+++ b/sys/dev/pccbb/pccbb.c
@@ -1,9 +1,8 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2002-2004 M. Warner Losh.
- * Copyright (c) 2000-2001 Jonathan Chen.
- * All rights reserved.
+ * Copyright (c) 2000-2001 Jonathan Chen All rights reserved.
+ * Copyright (c) 2002-2004 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/pccbb/pccbb_isa.c b/sys/dev/pccbb/pccbb_isa.c
index cb50adf9a23ba..ecc8e709981df 100644
--- a/sys/dev/pccbb/pccbb_isa.c
+++ b/sys/dev/pccbb/pccbb_isa.c
@@ -1,8 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2002-2004 M. Warner Losh.
- * All rights reserved.
+ * Copyright (c) 2002-2004 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/pccbb/pccbb_pci.c b/sys/dev/pccbb/pccbb_pci.c
index f2f6387c8aaa2..8288469bd1f06 100644
--- a/sys/dev/pccbb/pccbb_pci.c
+++ b/sys/dev/pccbb/pccbb_pci.c
@@ -1,9 +1,8 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2002-2004 M. Warner Losh.
- * Copyright (c) 2000-2001 Jonathan Chen.
- * All rights reserved.
+ * Copyright (c) 2000-2001 Jonathan Chen All rights reserved.
+ * Copyright (c) 2002-2004 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/pccbb/pccbbdevid.h b/sys/dev/pccbb/pccbbdevid.h
index 77b9d363dc4d4..be159c495ca39 100644
--- a/sys/dev/pccbb/pccbbdevid.h
+++ b/sys/dev/pccbb/pccbbdevid.h
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2001-2004 M. Warner Losh.
+ * Copyright (c) 2001-2004 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/pccbb/pccbbvar.h b/sys/dev/pccbb/pccbbvar.h
index 400e466b0779e..451b2c54fcabf 100644
--- a/sys/dev/pccbb/pccbbvar.h
+++ b/sys/dev/pccbb/pccbbvar.h
@@ -1,9 +1,8 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2003-2004 M. Warner Losh.
- * Copyright (c) 2000,2001 Jonathan Chen.
- * All rights reserved.
+ * Copyright (c) 2000,2001 Jonathan Chen All rights reserved.
+ * Copyright (c) 2003-2004 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/puc/puc_pci.c b/sys/dev/puc/puc_pci.c
index 0fbd5d7214d53..1c5e7f831165b 100644
--- a/sys/dev/puc/puc_pci.c
+++ b/sys/dev/puc/puc_pci.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-3-Clause
  *
  * Copyright (c) 2002 JF Hay.  All rights reserved.
- * Copyright (c) 2000 M. Warner Losh.
+ * Copyright (c) 2000 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/sdhci/sdhci_if.m b/sys/dev/sdhci/sdhci_if.m
index b70f04c8d37bc..93c97a155fb1f 100644
--- a/sys/dev/sdhci/sdhci_if.m
+++ b/sys/dev/sdhci/sdhci_if.m
@@ -1,6 +1,5 @@
 #-
-# Copyright (c) 2006 M. Warner Losh
-# All rights reserved.
+# Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/sys/dev/spibus/spi.h b/sys/dev/spibus/spi.h
index fa911b6fd363e..f09b1501317d8 100644
--- a/sys/dev/spibus/spi.h
+++ b/sys/dev/spibus/spi.h
@@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2006 M. Warner Losh
- * All rights reserved.
+ * Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/spibus/spibus.c b/sys/dev/spibus/spibus.c
index c8c23bf6b283b..44ca69578604a 100644
--- a/sys/dev/spibus/spibus.c
+++ b/sys/dev/spibus/spibus.c
@@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2006 M. Warner Losh
- * All rights reserved.
+ * Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/spibus/spibus_if.m b/sys/dev/spibus/spibus_if.m
index 4e8fa11f28051..8e95c358fa82c 100644
--- a/sys/dev/spibus/spibus_if.m
+++ b/sys/dev/spibus/spibus_if.m
@@ -1,6 +1,5 @@
 #-
-# Copyright (c) 2006 M. Warner Losh
-# All rights reserved.
+# Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/sys/dev/spibus/spibusvar.h b/sys/dev/spibus/spibusvar.h
index ffa016a15d69b..582700f01a46a 100644
--- a/sys/dev/spibus/spibusvar.h
+++ b/sys/dev/spibus/spibusvar.h
@@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2006 M. Warner Losh
- * All rights reserved.
+ * Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/uart/uart_bus_acpi.c b/sys/dev/uart/uart_bus_acpi.c
index 32eb3accd92b1..14e598f5a31fc 100644
--- a/sys/dev/uart/uart_bus_acpi.c
+++ b/sys/dev/uart/uart_bus_acpi.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2001 M. Warner Losh.
+ * Copyright (c) 2001 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/uart/uart_bus_isa.c b/sys/dev/uart/uart_bus_isa.c
index 5085ff66fe102..cebf90adf13fe 100644
--- a/sys/dev/uart/uart_bus_isa.c
+++ b/sys/dev/uart/uart_bus_isa.c
@@ -1,10 +1,9 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2008 TAKAHASHI Yoshihiro
- * Copyright (c) 2008 Marcel Moolenaar
- * Copyright (c) 2001 M. Warner Losh
- * All rights reserved.
+ * Copyright (c) 2008 TAKAHASHI Yoshihiro All rights reserved.
+ * Copyright (c) 2008 Marcel Moolenaar All rights reserved.
+ * Copyright (c) 2001 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/uart/uart_bus_pccard.c b/sys/dev/uart/uart_bus_pccard.c
index 240cab869187b..58571b13d66e0 100644
--- a/sys/dev/uart/uart_bus_pccard.c
+++ b/sys/dev/uart/uart_bus_pccard.c
@@ -1,8 +1,8 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2001 M. Warner Losh.
  * Copyright (c) 2003 Norikatsu Shigemura, Takenori Watanabe All rights reserved.
+ * Copyright (c) 2001 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/uart/uart_bus_pci.c b/sys/dev/uart/uart_bus_pci.c
index 7bf308bc4d164..03005fe6ea58f 100644
--- a/sys/dev/uart/uart_bus_pci.c
+++ b/sys/dev/uart/uart_bus_pci.c
@@ -1,9 +1,8 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2006 Marcel Moolenaar
- * Copyright (c) 2001 M. Warner Losh
- * All rights reserved.
+ * Copyright (c) 2006 Marcel Moolenaar All rights reserved.
+ * Copyright (c) 2001 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/uart/uart_bus_puc.c b/sys/dev/uart/uart_bus_puc.c
index c6c7a705774d6..a1dcdea11dd06 100644
--- a/sys/dev/uart/uart_bus_puc.c
+++ b/sys/dev/uart/uart_bus_puc.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2006 Marcel Moolenaar.  All rights reserved.
  * Copyright (c) 2002 JF Hay.  All rights reserved.
- * Copyright (c) 2001 M. Warner Losh.
+ * Copyright (c) 2001 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/usb/controller/generic_ohci.c b/sys/dev/usb/controller/generic_ohci.c
index c3a97616226fa..4b6c4dd4fcfae 100644
--- a/sys/dev/usb/controller/generic_ohci.c
+++ b/sys/dev/usb/controller/generic_ohci.c
@@ -1,6 +1,6 @@
 /*-
- * Copyright (c) 2006 M. Warner Losh.
  * Copyright (c) 2016 Emmanuel Vadot <manu@freebsd.org> All rights reserved.
+ * Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/usb/misc/ufm.c b/sys/dev/usb/misc/ufm.c
index aecff8ed8bd5c..494158ad04691 100644
--- a/sys/dev/usb/misc/ufm.c
+++ b/sys/dev/usb/misc/ufm.c
@@ -1,8 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2001 M. Warner Losh
- * All rights reserved.
+ * Copyright (c) 2001 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/usb/serial/ufoma.c b/sys/dev/usb/serial/ufoma.c
index c27232eca218b..eb58abc02afa0 100644
--- a/sys/dev/usb/serial/ufoma.c
+++ b/sys/dev/usb/serial/ufoma.c
@@ -6,9 +6,8 @@ __FBSDID("$FreeBSD$");
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
  *
- * Copyright (c) 2005, Takanori Watanabe
- * Copyright (c) 2003, M. Warner Losh <imp@FreeBSD.org>.
- * All rights reserved.
+ * Copyright (c) 2005, Takanori Watanabe All rights reserved.
+ * Copyright (c) 2003 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/usb/serial/umodem.c b/sys/dev/usb/serial/umodem.c
index 567fbe3fd4173..48ce73ff5d15f 100644
--- a/sys/dev/usb/serial/umodem.c
+++ b/sys/dev/usb/serial/umodem.c
@@ -6,8 +6,7 @@ __FBSDID("$FreeBSD$");
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
  *
- * Copyright (c) 2003, M. Warner Losh <imp@FreeBSD.org>.
- * All rights reserved.
+ * Copyright (c) 2003 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/usb/ufm_ioctl.h b/sys/dev/usb/ufm_ioctl.h
index 599d36d4c620c..dbd0862440a15 100644
--- a/sys/dev/usb/ufm_ioctl.h
+++ b/sys/dev/usb/ufm_ioctl.h
@@ -2,8 +2,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2001 M. Warner Losh
- * All rights reserved.
+ * Copyright (c) 2001 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/wi/if_wivar.h b/sys/dev/wi/if_wivar.h
index a97b0abe066e7..eef1297fc87b9 100644
--- a/sys/dev/wi/if_wivar.h
+++ b/sys/dev/wi/if_wivar.h
@@ -1,9 +1,9 @@
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
  *
- * Copyright (c) 2002 M Warner Losh <imp@freebsd.org>.
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
+ * Copyright (c) 2002 M Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/i386/include/_bus.h b/sys/i386/include/_bus.h
index 2f0b84220b534..bd716938af6d2 100644
--- a/sys/i386/include/_bus.h
+++ b/sys/i386/include/_bus.h
@@ -1,8 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2005 M. Warner Losh.
- * All rights reserved.
+ * Copyright (c) 2005 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/mips/cavium/uart_cpu_octeonusart.c b/sys/mips/cavium/uart_cpu_octeonusart.c
index c81c2741a724e..5aca02becee01 100644
--- a/sys/mips/cavium/uart_cpu_octeonusart.c
+++ b/sys/mips/cavium/uart_cpu_octeonusart.c
@@ -1,9 +1,8 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
+ * Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org> All rights reserved.
  * Copyright (c) 2009 M. Warner Losh <imp@FreeBSD.org>
- * Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/mips/include/_bus.h b/sys/mips/include/_bus.h
index 866c19f45664e..9edb1f183efc8 100644
--- a/sys/mips/include/_bus.h
+++ b/sys/mips/include/_bus.h
@@ -1,8 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2005 M. Warner Losh.
- * All rights reserved.
+ * Copyright (c) 2005 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/mips/include/elf.h b/sys/mips/include/elf.h
index b019df7061e5b..d62b237fdac02 100644
--- a/sys/mips/include/elf.h
+++ b/sys/mips/include/elf.h
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD AND BSD-2-Clause-NetBSD
  *
- * Copyright (c) 2013 M. Warner Losh.
+ * Copyright (c) 2013 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/mips/mips/ptrace_machdep.c b/sys/mips/mips/ptrace_machdep.c
index 372995c236995..8de58d6cc236c 100644
--- a/sys/mips/mips/ptrace_machdep.c
+++ b/sys/mips/mips/ptrace_machdep.c
@@ -1,8 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2009 M. Warner Losh.
- * All rights reserved.
+ * Copyright (c) 2009 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/powerpc/include/_bus.h b/sys/powerpc/include/_bus.h
index d39fb003f27a5..5a36ee68da6e1 100644
--- a/sys/powerpc/include/_bus.h
+++ b/sys/powerpc/include/_bus.h
@@ -1,8 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2005 M. Warner Losh.
- * All rights reserved.
+ * Copyright (c) 2005 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/riscv/include/_bus.h b/sys/riscv/include/_bus.h
index f11991f65ed4f..e2d3069323d56 100644
--- a/sys/riscv/include/_bus.h
+++ b/sys/riscv/include/_bus.h
@@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2005 M. Warner Losh.
- * All rights reserved.
+ * Copyright (c) 2005 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/sparc64/include/_bus.h b/sys/sparc64/include/_bus.h
index 554964612b2a6..e6b6101b9c543 100644
--- a/sys/sparc64/include/_bus.h
+++ b/sys/sparc64/include/_bus.h
@@ -1,8 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2005 M. Warner Losh.
- * All rights reserved.
+ * Copyright (c) 2005 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/tools/tools/git/git-svn-rebase b/tools/tools/git/git-svn-rebase
index 4c2faf0cc1215..7b31e327a4e51 100755
--- a/tools/tools/git/git-svn-rebase
+++ b/tools/tools/git/git-svn-rebase
@@ -4,7 +4,7 @@
 
 # SPDX-License-Identifier: BSD-2-Clause-FreeBSD
 #
-#  Copyright (c) 2018 M. Warner Losh
+#  Copyright (c) 2018 M. Warner Losh <imp@FreeBSD.org>
 #
 #  Redistribution and use in source and binary forms, with or without
 #  modification, are permitted provided that the following conditions
diff --git a/tools/tools/nanobsd/dhcpd/common b/tools/tools/nanobsd/dhcpd/common
index dc595aa281165..6ea48b59376ca 100644
--- a/tools/tools/nanobsd/dhcpd/common
+++ b/tools/tools/nanobsd/dhcpd/common
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2014 M. Warner Losh.
+# Copyright (c) 2014 M. Warner Losh <imp@FreeBSD.org>
 # Copyright (c) 2010 iXsystems, Inc.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/dhcpd/os-base b/tools/tools/nanobsd/dhcpd/os-base
index 87615e7a637cf..4a4d0c4b85532 100644
--- a/tools/tools/nanobsd/dhcpd/os-base
+++ b/tools/tools/nanobsd/dhcpd/os-base
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2014 M. Warner Losh.
+# Copyright (c) 2014 M. Warner Losh <imp@FreeBSD.org>
 # Copyright (c) 2010-2011 iXsystems, Inc.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/beaglebone.cfg b/tools/tools/nanobsd/embedded/beaglebone.cfg
index 72c36bfd89a91..03f5f8ac2900f 100644
--- a/tools/tools/nanobsd/embedded/beaglebone.cfg
+++ b/tools/tools/nanobsd/embedded/beaglebone.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 M. Warner Losh.
+# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 # Copyright (c) 2010-2011 iXsystems, Inc.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common
index 6c4c7adbe16aa..9233baa03839a 100644
--- a/tools/tools/nanobsd/embedded/common
+++ b/tools/tools/nanobsd/embedded/common
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 M. Warner Losh.
+# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 # Copyright (c) 2010-2011 iXsystems, Inc.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/i386.cfg b/tools/tools/nanobsd/embedded/i386.cfg
index e897ece9c96b6..876cb105b116c 100644
--- a/tools/tools/nanobsd/embedded/i386.cfg
+++ b/tools/tools/nanobsd/embedded/i386.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 M. Warner Losh.
+# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 # Copyright (c) 2010-2011 iXsystems, Inc.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/pandaboard.cfg b/tools/tools/nanobsd/embedded/pandaboard.cfg
index 357a7ab713207..887df4f5b752a 100644
--- a/tools/tools/nanobsd/embedded/pandaboard.cfg
+++ b/tools/tools/nanobsd/embedded/pandaboard.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2016 M. Warner Losh.
+# Copyright (c) 2016 M. Warner Losh <imp@FreeBSD.org>
 # Copyright (c) 2010-2011 iXsystems, Inc.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg b/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg
index 7ac31de7242de..98d8a49f097c4 100644
--- a/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 M. Warner Losh.
+# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 # Copyright (c) 2010-2011 iXsystems, Inc.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg b/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg
index 083b0e6b064b8..d46b3fef0bdaa 100644
--- a/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 M. Warner Losh.
+# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 # Copyright (c) 2010-2011 iXsystems, Inc.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/qemu-amd64.cfg b/tools/tools/nanobsd/embedded/qemu-amd64.cfg
index d1ad0a33c5694..98b9ef47cad07 100644
--- a/tools/tools/nanobsd/embedded/qemu-amd64.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-amd64.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 M. Warner Losh.
+# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 # Copyright (c) 2010-2011 iXsystems, Inc.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/qemu-armv7.cfg b/tools/tools/nanobsd/embedded/qemu-armv7.cfg
index c14c1681b9d74..2bf3f48114d57 100644
--- a/tools/tools/nanobsd/embedded/qemu-armv7.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-armv7.cfg
@@ -2,7 +2,7 @@
 
 #-
 # Copyright (c) 2016 Andrew Turner. All Rights Reserved.
-# Copyright (c) 2015 M. Warner Losh.
+# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 # Copyright (c) 2010-2011 iXsystems, Inc.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/qemu-i386.cfg b/tools/tools/nanobsd/embedded/qemu-i386.cfg
index 660edea21cca1..63310a073dc1f 100644
--- a/tools/tools/nanobsd/embedded/qemu-i386.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-i386.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 M. Warner Losh.
+# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 # Copyright (c) 2010-2011 iXsystems, Inc.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/qemu-mips.cfg b/tools/tools/nanobsd/embedded/qemu-mips.cfg
index c295ffcaa262a..341f7f9c1430c 100644
--- a/tools/tools/nanobsd/embedded/qemu-mips.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-mips.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 M. Warner Losh.
+# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 # Copyright (c) 2010-2011 iXsystems, Inc.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/qemu-mips64.cfg b/tools/tools/nanobsd/embedded/qemu-mips64.cfg
index f4f50c4e47013..6e936b1567571 100644
--- a/tools/tools/nanobsd/embedded/qemu-mips64.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-mips64.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 M. Warner Losh.
+# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 # Copyright (c) 2010-2011 iXsystems, Inc.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/qemu-powerpc.cfg b/tools/tools/nanobsd/embedded/qemu-powerpc.cfg
index fc0a5174a5513..2bde6e6dcec71 100644
--- a/tools/tools/nanobsd/embedded/qemu-powerpc.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-powerpc.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 M. Warner Losh.
+# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 # Copyright (c) 2010-2011 iXsystems, Inc.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg b/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg
index b272f65255239..e16cefdb7434b 100644
--- a/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 M. Warner Losh.
+# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 # Copyright (c) 2010-2011 iXsystems, Inc.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/qemu-sparc64.cfg b/tools/tools/nanobsd/embedded/qemu-sparc64.cfg
index 3103094d18eb7..9a63c9b42d555 100644
--- a/tools/tools/nanobsd/embedded/qemu-sparc64.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-sparc64.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 M. Warner Losh.
+# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 # Copyright (c) 2010-2011 iXsystems, Inc.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/rpi.cfg b/tools/tools/nanobsd/embedded/rpi.cfg
index 4f241bd370c93..bf367ed262017 100644
--- a/tools/tools/nanobsd/embedded/rpi.cfg
+++ b/tools/tools/nanobsd/embedded/rpi.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 M. Warner Losh.
+# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 # Copyright (c) 2010-2011 iXsystems, Inc.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/rpi2.cfg b/tools/tools/nanobsd/embedded/rpi2.cfg
index 46c292bc71e1b..2776aec18771b 100644
--- a/tools/tools/nanobsd/embedded/rpi2.cfg
+++ b/tools/tools/nanobsd/embedded/rpi2.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 M. Warner Losh.
+# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 # Copyright (c) 2010-2011 iXsystems, Inc.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/embedded/rpi3.cfg b/tools/tools/nanobsd/embedded/rpi3.cfg
index ae008b4eb025e..f3804c739b143 100644
--- a/tools/tools/nanobsd/embedded/rpi3.cfg
+++ b/tools/tools/nanobsd/embedded/rpi3.cfg
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 #-
-# Copyright (c) 2015 M. Warner Losh.
+# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 # Copyright (c) 2010-2011 iXsystems, Inc.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/tools/tools/nanobsd/legacy.sh b/tools/tools/nanobsd/legacy.sh
index 0832179ba2271..b59a9e795b66f 100644
--- a/tools/tools/nanobsd/legacy.sh
+++ b/tools/tools/nanobsd/legacy.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# Copyright (c) 2005 Poul-Henning Kamp.
-# Copyright (c) 2016 M. Warner Losh.
-# All rights reserved.
+# Copyright (c) 2005 Poul-Henning Kamp All rights reserved.
+# Copyright (c) 2016 M. Warner Losh <imp@FreeBSD.org>
+#
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/tools/tools/nanobsd/mtree-dedup.awk b/tools/tools/nanobsd/mtree-dedup.awk
index 5390540ff8282..002a51f3fab03 100755
--- a/tools/tools/nanobsd/mtree-dedup.awk
+++ b/tools/tools/nanobsd/mtree-dedup.awk
@@ -1,7 +1,7 @@
 #!/usr/bin/awk -f
 
 #
-# Copyright (c) 2015 M. Warner Losh.
+# Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
diff --git a/usr.sbin/dumpcis/dumpcis.8 b/usr.sbin/dumpcis/dumpcis.8
index 86949df6f28b5..3f49807f205fb 100644
--- a/usr.sbin/dumpcis/dumpcis.8
+++ b/usr.sbin/dumpcis/dumpcis.8
@@ -1,6 +1,5 @@
 .\"
 .\" Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
-.\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
diff --git a/usr.sbin/dumpcis/main.c b/usr.sbin/dumpcis/main.c
index c130e80e81127..28ae2dae49c4e 100644
--- a/usr.sbin/dumpcis/main.c
+++ b/usr.sbin/dumpcis/main.c
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2006 M. Warner Losh.
+ * Copyright (c) 2006 M. Warner Losh <imp@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions