diff --git a/cf/maybe-valgrind.sh b/cf/maybe-valgrind.sh
index 4077a3278..5e20d98a8 100755
--- a/cf/maybe-valgrind.sh
+++ b/cf/maybe-valgrind.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2006 - 2007 Kungliga Tekniska Högskolan
+# Copyright (c) 2006 - 2007 Kungliga Tekniska Högskolan
 # (Royal Institute of Technology, Stockholm, Sweden). 
 # All rights reserved. 
 #
diff --git a/kcm/sessions.c b/kcm/sessions.c
index c44e48c5b..4e66cc5e8 100644
--- a/kcm/sessions.c
+++ b/kcm/sessions.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/kdc/digest-service.c b/kdc/digest-service.c
index 5bd7324ed..3a4f4c551 100644
--- a/kdc/digest-service.c
+++ b/kdc/digest-service.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 - 2007 Kungliga Tekniska Högskolan
+ * Copyright (c) 2006 - 2007 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/asn1/asn1-template.h b/lib/asn1/asn1-template.h
index 6be8d79a9..a8501e76f 100644
--- a/lib/asn1/asn1-template.h
+++ b/lib/asn1/asn1-template.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2006 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2006 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/asn1/gen_template.c b/lib/asn1/gen_template.c
index ed57d380f..a1c38edae 100644
--- a/lib/asn1/gen_template.c
+++ b/lib/asn1/gen_template.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2005 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2005 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/gssapi/mech/gss_store_cred.c b/lib/gssapi/mech/gss_store_cred.c
index 4073bb981..7a9344a81 100644
--- a/lib/gssapi/mech/gss_store_cred.c
+++ b/lib/gssapi/mech/gss_store_cred.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/gssapi/netlogon/accept_sec_context.c b/lib/gssapi/netlogon/accept_sec_context.c
index 03eb9d101..06ddfd507 100644
--- a/lib/gssapi/netlogon/accept_sec_context.c
+++ b/lib/gssapi/netlogon/accept_sec_context.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/gssapi/netlogon/canonicalize_name.c b/lib/gssapi/netlogon/canonicalize_name.c
index 5c1602896..1e8087a7c 100644
--- a/lib/gssapi/netlogon/canonicalize_name.c
+++ b/lib/gssapi/netlogon/canonicalize_name.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/gssapi/netlogon/context_time.c b/lib/gssapi/netlogon/context_time.c
index b8def8770..c7bf9eb14 100644
--- a/lib/gssapi/netlogon/context_time.c
+++ b/lib/gssapi/netlogon/context_time.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/gssapi/netlogon/display_status.c b/lib/gssapi/netlogon/display_status.c
index d90505612..68946e537 100644
--- a/lib/gssapi/netlogon/display_status.c
+++ b/lib/gssapi/netlogon/display_status.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/gssapi/netlogon/export_name.c b/lib/gssapi/netlogon/export_name.c
index a010cdf44..9984f8bfe 100644
--- a/lib/gssapi/netlogon/export_name.c
+++ b/lib/gssapi/netlogon/export_name.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/gssapi/netlogon/iter_cred.c b/lib/gssapi/netlogon/iter_cred.c
index 13f32d6e9..93a8d59ab 100644
--- a/lib/gssapi/netlogon/iter_cred.c
+++ b/lib/gssapi/netlogon/iter_cred.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/gssapi/netlogon/process_context_token.c b/lib/gssapi/netlogon/process_context_token.c
index fa4d26557..0f8361337 100644
--- a/lib/gssapi/netlogon/process_context_token.c
+++ b/lib/gssapi/netlogon/process_context_token.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/gssapi/ntlm/inquire_sec_context_by_oid.c b/lib/gssapi/ntlm/inquire_sec_context_by_oid.c
index c40bf492f..2b42b1f51 100644
--- a/lib/gssapi/ntlm/inquire_sec_context_by_oid.c
+++ b/lib/gssapi/ntlm/inquire_sec_context_by_oid.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 Kungliga Tekniska Högskolan
+ * Copyright (c) 2006 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/gssapi/ntlm/iter_cred.c b/lib/gssapi/ntlm/iter_cred.c
index 34456db5d..ee5ec172c 100644
--- a/lib/gssapi/ntlm/iter_cred.c
+++ b/lib/gssapi/ntlm/iter_cred.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 Kungliga Tekniska Högskolan
+ * Copyright (c) 2006 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/gssapi/ntlm/set_sec_context_option.c b/lib/gssapi/ntlm/set_sec_context_option.c
index 199e72247..f97443d9e 100644
--- a/lib/gssapi/ntlm/set_sec_context_option.c
+++ b/lib/gssapi/ntlm/set_sec_context_option.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 Kungliga Tekniska Högskolan
+ * Copyright (c) 2006 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/hcrypto/ec.c b/lib/hcrypto/ec.c
index 405981984..5a5c3c7d5 100644
--- a/lib/hcrypto/ec.c
+++ b/lib/hcrypto/ec.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/hcrypto/ec.h b/lib/hcrypto/ec.h
index 726deec61..8fa4d11d6 100644
--- a/lib/hcrypto/ec.h
+++ b/lib/hcrypto/ec.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2016 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009-2016 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/hcrypto/ecdh.h b/lib/hcrypto/ecdh.h
index 4dda28499..f224afdb1 100644
--- a/lib/hcrypto/ecdh.h
+++ b/lib/hcrypto/ecdh.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/hcrypto/ecdsa.h b/lib/hcrypto/ecdsa.h
index 84886f407..ffae17bc6 100644
--- a/lib/hcrypto/ecdsa.h
+++ b/lib/hcrypto/ecdsa.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/hdb/hdb-keytab.c b/lib/hdb/hdb-keytab.c
index 345dc18b7..f3cb8fbe6 100644
--- a/lib/hdb/hdb-keytab.c
+++ b/lib/hdb/hdb-keytab.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/hdb/hdb-sqlite.c b/lib/hdb/hdb-sqlite.c
index ab461d3ba..beff06d4a 100644
--- a/lib/hdb/hdb-sqlite.c
+++ b/lib/hdb/hdb-sqlite.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/hx509/data/static-file b/lib/hx509/data/static-file
index 2216857cc..3dd819e3e 100644
--- a/lib/hx509/data/static-file
+++ b/lib/hx509/data/static-file
@@ -2,7 +2,7 @@ This is a static file don't change the content, it is used in the test
 
 #!/bin/sh
 #
-# Copyright (c) 2005 Kungliga Tekniska Högskolan
+# Copyright (c) 2005 Kungliga Tekniska Högskolan
 # (Royal Institute of Technology, Stockholm, Sweden). 
 # All rights reserved. 
 #
diff --git a/lib/ipc/client.c b/lib/ipc/client.c
index 5c8206fa3..39e1b491e 100644
--- a/lib/ipc/client.c
+++ b/lib/ipc/client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/ipc/common.c b/lib/ipc/common.c
index b7b237c82..cfbe4b5b9 100644
--- a/lib/ipc/common.c
+++ b/lib/ipc/common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/ipc/heim-ipc.h b/lib/ipc/heim-ipc.h
index 0f4a3ad64..a34e33807 100644
--- a/lib/ipc/heim-ipc.h
+++ b/lib/ipc/heim-ipc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/ipc/heim_ipc.defs b/lib/ipc/heim_ipc.defs
index ae8479137..d2af7eccc 100644
--- a/lib/ipc/heim_ipc.defs
+++ b/lib/ipc/heim_ipc.defs
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/ipc/heim_ipc_async.defs b/lib/ipc/heim_ipc_async.defs
index 73157c0d1..406e6a2af 100644
--- a/lib/ipc/heim_ipc_async.defs
+++ b/lib/ipc/heim_ipc_async.defs
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/ipc/heim_ipc_reply.defs b/lib/ipc/heim_ipc_reply.defs
index 820948556..f95d0fa32 100644
--- a/lib/ipc/heim_ipc_reply.defs
+++ b/lib/ipc/heim_ipc_reply.defs
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/ipc/heim_ipc_types.h b/lib/ipc/heim_ipc_types.h
index c853610f1..fb5c165f0 100644
--- a/lib/ipc/heim_ipc_types.h
+++ b/lib/ipc/heim_ipc_types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/ipc/hi_locl.h b/lib/ipc/hi_locl.h
index 7efe6ca84..6ec28ffc3 100644
--- a/lib/ipc/hi_locl.h
+++ b/lib/ipc/hi_locl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/ipc/server.c b/lib/ipc/server.c
index 548a40a1a..839a59638 100644
--- a/lib/ipc/server.c
+++ b/lib/ipc/server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/ipc/tc.c b/lib/ipc/tc.c
index 91382aa35..e366f1789 100644
--- a/lib/ipc/tc.c
+++ b/lib/ipc/tc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/ipc/ts-http.c b/lib/ipc/ts-http.c
index fbeb31956..c3c3ce5e3 100644
--- a/lib/ipc/ts-http.c
+++ b/lib/ipc/ts-http.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/ipc/ts.c b/lib/ipc/ts.c
index 9d7693bf4..3ba5d6555 100644
--- a/lib/ipc/ts.c
+++ b/lib/ipc/ts.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/krb5/deprecated.c b/lib/krb5/deprecated.c
index acdc8b476..423ea1435 100644
--- a/lib/krb5/deprecated.c
+++ b/lib/krb5/deprecated.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *
diff --git a/lib/krb5/test_gic.c b/lib/krb5/test_gic.c
index f22a6930f..f11777e46 100644
--- a/lib/krb5/test_gic.c
+++ b/lib/krb5/test_gic.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Kungliga Tekniska Högskolan
+ * Copyright (c) 2009 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  *