diff --git a/LICENSE b/LICENSE
index d0a963c..3d17162 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 
 Copyright (c) 2002-2003 Networks Associates Technology, Inc.
-Copyright (c) 2004-2009 Dag-Erling Smørgrav
+Copyright (c) 2004-2009 Dag-Erling Smørgrav
 All rights reserved.
 
 This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/bin/su/su.c b/bin/su/su.c
index 706261b..10977e1 100644
--- a/bin/su/su.c
+++ b/bin/su/su.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/doc/man/pam.conf.5 b/doc/man/pam.conf.5
index 220de2a..8759f36 100644
--- a/doc/man/pam.conf.5
+++ b/doc/man/pam.conf.5
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2005 Dag-Erling Coïdan Smørgrav
+.\" Copyright (c) 2005 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
diff --git a/doc/man/pam_conv.3 b/doc/man/pam_conv.3
index 76fccf8..0a5e70e 100644
--- a/doc/man/pam_conv.3
+++ b/doc/man/pam_conv.3
@@ -1,6 +1,6 @@
 .\"-
 .\" Copyright (c) 2002-2003 Networks Associates Technology, Inc.
-.\" Copyright (c) 2004-2009 Dag-Erling Smørgrav
+.\" Copyright (c) 2004-2009 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/include/security/openpam.h b/include/security/openpam.h
index 89096b8..c03503b 100644
--- a/include/security/openpam.h
+++ b/include/security/openpam.h
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/include/security/openpam_version.h b/include/security/openpam_version.h
index d73fa29..6764cb4 100644
--- a/include/security/openpam_version.h
+++ b/include/security/openpam_version.h
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/include/security/pam_appl.h b/include/security/pam_appl.h
index b3fbe97..5e1af4f 100644
--- a/include/security/pam_appl.h
+++ b/include/security/pam_appl.h
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/include/security/pam_constants.h b/include/security/pam_constants.h
index 642320c..d416b5e 100644
--- a/include/security/pam_constants.h
+++ b/include/security/pam_constants.h
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/include/security/pam_modules.h b/include/security/pam_modules.h
index b357d8c..5418591 100644
--- a/include/security/pam_modules.h
+++ b/include/security/pam_modules.h
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/include/security/pam_types.h b/include/security/pam_types.h
index 327a560..eb0fe16 100644
--- a/include/security/pam_types.h
+++ b/include/security/pam_types.h
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/openpam_borrow_cred.c b/lib/openpam_borrow_cred.c
index c739107..8b4614e 100644
--- a/lib/openpam_borrow_cred.c
+++ b/lib/openpam_borrow_cred.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/openpam_configure.c b/lib/openpam_configure.c
index 96a428a..248914f 100644
--- a/lib/openpam_configure.c
+++ b/lib/openpam_configure.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2001-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/openpam_dispatch.c b/lib/openpam_dispatch.c
index 662c780..c347eb9 100644
--- a/lib/openpam_dispatch.c
+++ b/lib/openpam_dispatch.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/openpam_dynamic.c b/lib/openpam_dynamic.c
index 0a4f85b..33f99b2 100644
--- a/lib/openpam_dynamic.c
+++ b/lib/openpam_dynamic.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/openpam_findenv.c b/lib/openpam_findenv.c
index 82f09f5..65037be 100644
--- a/lib/openpam_findenv.c
+++ b/lib/openpam_findenv.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/openpam_free_data.c b/lib/openpam_free_data.c
index 0240170..0a93bdf 100644
--- a/lib/openpam_free_data.c
+++ b/lib/openpam_free_data.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/openpam_free_envlist.c b/lib/openpam_free_envlist.c
index 03247a0..d6fcfd9 100644
--- a/lib/openpam_free_envlist.c
+++ b/lib/openpam_free_envlist.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2005-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2005-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/openpam_get_option.c b/lib/openpam_get_option.c
index 8668f0c..a65f074 100644
--- a/lib/openpam_get_option.c
+++ b/lib/openpam_get_option.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/openpam_impl.h b/lib/openpam_impl.h
index ae53bb5..80d996e 100644
--- a/lib/openpam_impl.h
+++ b/lib/openpam_impl.h
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2001-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/openpam_load.c b/lib/openpam_load.c
index c1c1c6a..3cceb9d 100644
--- a/lib/openpam_load.c
+++ b/lib/openpam_load.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/openpam_log.c b/lib/openpam_log.c
index d10ec41..336bced 100644
--- a/lib/openpam_log.c
+++ b/lib/openpam_log.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/openpam_nullconv.c b/lib/openpam_nullconv.c
index c5753d6..833e351 100644
--- a/lib/openpam_nullconv.c
+++ b/lib/openpam_nullconv.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/openpam_readline.c b/lib/openpam_readline.c
index 7643b95..a88a5ac 100644
--- a/lib/openpam_readline.c
+++ b/lib/openpam_readline.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/openpam_restore_cred.c b/lib/openpam_restore_cred.c
index 94e0d6f..b624f1d 100644
--- a/lib/openpam_restore_cred.c
+++ b/lib/openpam_restore_cred.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/openpam_set_option.c b/lib/openpam_set_option.c
index ed75214..20eb83e 100644
--- a/lib/openpam_set_option.c
+++ b/lib/openpam_set_option.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/openpam_static.c b/lib/openpam_static.c
index 33e6ae8..3030552 100644
--- a/lib/openpam_static.c
+++ b/lib/openpam_static.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/openpam_ttyconv.c b/lib/openpam_ttyconv.c
index eac0352..e41f145 100644
--- a/lib/openpam_ttyconv.c
+++ b/lib/openpam_ttyconv.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_acct_mgmt.c b/lib/pam_acct_mgmt.c
index 76c2c52..9c8522f 100644
--- a/lib/pam_acct_mgmt.c
+++ b/lib/pam_acct_mgmt.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_authenticate.c b/lib/pam_authenticate.c
index 132cce6..4407772 100644
--- a/lib/pam_authenticate.c
+++ b/lib/pam_authenticate.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_authenticate_secondary.c b/lib/pam_authenticate_secondary.c
index f10b961..d746ea5 100644
--- a/lib/pam_authenticate_secondary.c
+++ b/lib/pam_authenticate_secondary.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_chauthtok.c b/lib/pam_chauthtok.c
index bdb2210..0fce43c 100644
--- a/lib/pam_chauthtok.c
+++ b/lib/pam_chauthtok.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_close_session.c b/lib/pam_close_session.c
index 9d15df6..478932d 100644
--- a/lib/pam_close_session.c
+++ b/lib/pam_close_session.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_end.c b/lib/pam_end.c
index 1c63ac6..d025855 100644
--- a/lib/pam_end.c
+++ b/lib/pam_end.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_error.c b/lib/pam_error.c
index c94fa49..23c545b 100644
--- a/lib/pam_error.c
+++ b/lib/pam_error.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_get_authtok.c b/lib/pam_get_authtok.c
index be3f3f7..7854c77 100644
--- a/lib/pam_get_authtok.c
+++ b/lib/pam_get_authtok.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_get_data.c b/lib/pam_get_data.c
index c12cd39..2317c2d 100644
--- a/lib/pam_get_data.c
+++ b/lib/pam_get_data.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_get_item.c b/lib/pam_get_item.c
index 4e832bf..1253dee 100644
--- a/lib/pam_get_item.c
+++ b/lib/pam_get_item.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_get_mapped_authtok.c b/lib/pam_get_mapped_authtok.c
index 6fd9a65..77d720a 100644
--- a/lib/pam_get_mapped_authtok.c
+++ b/lib/pam_get_mapped_authtok.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_get_mapped_username.c b/lib/pam_get_mapped_username.c
index 606cfff..350401b 100644
--- a/lib/pam_get_mapped_username.c
+++ b/lib/pam_get_mapped_username.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_get_user.c b/lib/pam_get_user.c
index eed735b..375c1d3 100644
--- a/lib/pam_get_user.c
+++ b/lib/pam_get_user.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_getenv.c b/lib/pam_getenv.c
index c1e660a..802be58 100644
--- a/lib/pam_getenv.c
+++ b/lib/pam_getenv.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_getenvlist.c b/lib/pam_getenvlist.c
index a8253dc..e359bf7 100644
--- a/lib/pam_getenvlist.c
+++ b/lib/pam_getenvlist.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_info.c b/lib/pam_info.c
index 0e0e505..d519d6b 100644
--- a/lib/pam_info.c
+++ b/lib/pam_info.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_open_session.c b/lib/pam_open_session.c
index 45ec376..a324ce2 100644
--- a/lib/pam_open_session.c
+++ b/lib/pam_open_session.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_prompt.c b/lib/pam_prompt.c
index 4bb0e20..80e36b2 100644
--- a/lib/pam_prompt.c
+++ b/lib/pam_prompt.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_putenv.c b/lib/pam_putenv.c
index e86baa1..c624a00 100644
--- a/lib/pam_putenv.c
+++ b/lib/pam_putenv.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_set_data.c b/lib/pam_set_data.c
index 246cadd..78fb61e 100644
--- a/lib/pam_set_data.c
+++ b/lib/pam_set_data.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_set_item.c b/lib/pam_set_item.c
index 7be5c0a..352df49 100644
--- a/lib/pam_set_item.c
+++ b/lib/pam_set_item.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_set_mapped_authtok.c b/lib/pam_set_mapped_authtok.c
index 75df65e..b770e4e 100644
--- a/lib/pam_set_mapped_authtok.c
+++ b/lib/pam_set_mapped_authtok.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_set_mapped_username.c b/lib/pam_set_mapped_username.c
index 0ec9e78..d94f673 100644
--- a/lib/pam_set_mapped_username.c
+++ b/lib/pam_set_mapped_username.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_setcred.c b/lib/pam_setcred.c
index 2d52266..e97e8d7 100644
--- a/lib/pam_setcred.c
+++ b/lib/pam_setcred.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_setenv.c b/lib/pam_setenv.c
index 3867395..ceb1440 100644
--- a/lib/pam_setenv.c
+++ b/lib/pam_setenv.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_sm_acct_mgmt.c b/lib/pam_sm_acct_mgmt.c
index 088a937..24383b4 100644
--- a/lib/pam_sm_acct_mgmt.c
+++ b/lib/pam_sm_acct_mgmt.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_sm_authenticate.c b/lib/pam_sm_authenticate.c
index 203d361..5c49948 100644
--- a/lib/pam_sm_authenticate.c
+++ b/lib/pam_sm_authenticate.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_sm_authenticate_secondary.c b/lib/pam_sm_authenticate_secondary.c
index 0bf6cf6..d7efa4c 100644
--- a/lib/pam_sm_authenticate_secondary.c
+++ b/lib/pam_sm_authenticate_secondary.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_sm_chauthtok.c b/lib/pam_sm_chauthtok.c
index a870d04..28ec7c9 100644
--- a/lib/pam_sm_chauthtok.c
+++ b/lib/pam_sm_chauthtok.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_sm_close_session.c b/lib/pam_sm_close_session.c
index 1498347..4f3d0c0 100644
--- a/lib/pam_sm_close_session.c
+++ b/lib/pam_sm_close_session.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_sm_get_mapped_authtok.c b/lib/pam_sm_get_mapped_authtok.c
index 41cffdf..aa60938 100644
--- a/lib/pam_sm_get_mapped_authtok.c
+++ b/lib/pam_sm_get_mapped_authtok.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_sm_get_mapped_username.c b/lib/pam_sm_get_mapped_username.c
index 639604f..7ce9fc7 100644
--- a/lib/pam_sm_get_mapped_username.c
+++ b/lib/pam_sm_get_mapped_username.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_sm_open_session.c b/lib/pam_sm_open_session.c
index ddfba63..3b83086 100644
--- a/lib/pam_sm_open_session.c
+++ b/lib/pam_sm_open_session.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_sm_set_mapped_authtok.c b/lib/pam_sm_set_mapped_authtok.c
index cf8fa6a..06c1ae4 100644
--- a/lib/pam_sm_set_mapped_authtok.c
+++ b/lib/pam_sm_set_mapped_authtok.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_sm_set_mapped_username.c b/lib/pam_sm_set_mapped_username.c
index 38faacb..58fdd40 100644
--- a/lib/pam_sm_set_mapped_username.c
+++ b/lib/pam_sm_set_mapped_username.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_sm_setcred.c b/lib/pam_sm_setcred.c
index f11cc7f..1dca8ea 100644
--- a/lib/pam_sm_setcred.c
+++ b/lib/pam_sm_setcred.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_start.c b/lib/pam_start.c
index e4618f6..03fdbd2 100644
--- a/lib/pam_start.c
+++ b/lib/pam_start.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_strerror.c b/lib/pam_strerror.c
index bc8e2d8..97abed7 100644
--- a/lib/pam_strerror.c
+++ b/lib/pam_strerror.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_verror.c b/lib/pam_verror.c
index 6fedf2b..f34743d 100644
--- a/lib/pam_verror.c
+++ b/lib/pam_verror.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_vinfo.c b/lib/pam_vinfo.c
index 180e879..5dc47db 100644
--- a/lib/pam_vinfo.c
+++ b/lib/pam_vinfo.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/lib/pam_vprompt.c b/lib/pam_vprompt.c
index 1e5b75d..8844568 100644
--- a/lib/pam_vprompt.c
+++ b/lib/pam_vprompt.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/misc/gendoc.pl b/misc/gendoc.pl
index d6da5e7..0192b56 100644
--- a/misc/gendoc.pl
+++ b/misc/gendoc.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 #-
 # Copyright (c) 2002-2003 Networks Associates Technology, Inc.
-# Copyright (c) 2004-2009 Dag-Erling Smørgrav
+# Copyright (c) 2004-2009 Dag-Erling Smørgrav
 # All rights reserved.
 #
 # This software was developed for the FreeBSD Project by ThinkSec AS and
@@ -45,7 +45,7 @@ use vars qw($COPYRIGHT $TODAY %FUNCTIONS %PAMERR);
 
 $COPYRIGHT = ".\\\"-
 .\\\" Copyright (c) 2001-2003 Networks Associates Technology, Inc.
-.\\\" Copyright (c) 2004-2009 Dag-Erling Smørgrav
+.\\\" Copyright (c) 2004-2009 Dag-Erling Smørgrav
 .\\\" All rights reserved.
 .\\\"
 .\\\" This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/modules/pam_deny/pam_deny.c b/modules/pam_deny/pam_deny.c
index cbce6df..f5532de 100644
--- a/modules/pam_deny/pam_deny.c
+++ b/modules/pam_deny/pam_deny.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/modules/pam_permit/pam_permit.c b/modules/pam_permit/pam_permit.c
index 0941438..87ceddc 100644
--- a/modules/pam_permit/pam_permit.c
+++ b/modules/pam_permit/pam_permit.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
diff --git a/modules/pam_unix/pam_unix.c b/modules/pam_unix/pam_unix.c
index 12aa03c..6e4a104 100644
--- a/modules/pam_unix/pam_unix.c
+++ b/modules/pam_unix/pam_unix.c
@@ -1,6 +1,6 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2009 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2009 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and