Fix FSF copyright notices.

174 files changed, 174 insertions, 174 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index fd366f0f5b..e389d2515b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #
 # Author: Nikos Mavrogiannopoulos
 #
diff --git a/lib/auth_anon.c b/lib/auth_anon.c
index cf4bd4fb1d..28932e918d 100644
--- a/lib/auth_anon.c
+++ b/lib/auth_anon.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/auth_anon.h b/lib/auth_anon.h
index b1705f852a..66bb692b22 100644
--- a/lib/auth_anon.h
+++ b/lib/auth_anon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/auth_cert.c b/lib/auth_cert.c
index 5a6d8beae3..337f67fa63 100644
--- a/lib/auth_cert.c
+++ b/lib/auth_cert.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/auth_cert.h b/lib/auth_cert.h
index f982bc7a18..1351af96b3 100644
--- a/lib/auth_cert.h
+++ b/lib/auth_cert.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/auth_dh_common.c b/lib/auth_dh_common.c
index 0e4b3ce442..d24db7f136 100644
--- a/lib/auth_dh_common.c
+++ b/lib/auth_dh_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2009 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/auth_dh_common.h b/lib/auth_dh_common.h
index b4ec6b6a00..fe243bbe67 100644
--- a/lib/auth_dh_common.h
+++ b/lib/auth_dh_common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/auth_dhe.c b/lib/auth_dhe.c
index eca85b34fa..ee5f7704eb 100644
--- a/lib/auth_dhe.c
+++ b/lib/auth_dhe.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2009 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/auth_dhe_psk.c b/lib/auth_dhe_psk.c
index 386d5fb9b6..d3b09f28db 100644
--- a/lib/auth_dhe_psk.c
+++ b/lib/auth_dhe_psk.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007, 2009 Free Software Foundation
+ * Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/auth_psk.c b/lib/auth_psk.c
index 9afd966d64..e33c0ef552 100644
--- a/lib/auth_psk.c
+++ b/lib/auth_psk.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/auth_psk.h b/lib/auth_psk.h
index c71ec15ff9..9ae4bd0377 100644
--- a/lib/auth_psk.h
+++ b/lib/auth_psk.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/auth_psk_passwd.c b/lib/auth_psk_passwd.c
index c599628a60..78f540a55f 100644
--- a/lib/auth_psk_passwd.c
+++ b/lib/auth_psk_passwd.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/auth_psk_passwd.h b/lib/auth_psk_passwd.h
index 8e847c07d1..0c8a1d805e 100644
--- a/lib/auth_psk_passwd.h
+++ b/lib/auth_psk_passwd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007 Free Software Foundation
+ * Copyright (C) 2005, 2007 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/auth_rsa.c b/lib/auth_rsa.c
index d9beface32..b8c498a7dc 100644
--- a/lib/auth_rsa.c
+++ b/lib/auth_rsa.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/auth_rsa_export.c b/lib/auth_rsa_export.c
index 52adff6be8..e07325a620 100644
--- a/lib/auth_rsa_export.c
+++ b/lib/auth_rsa_export.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/auth_srp.c b/lib/auth_srp.c
index 6eac98d123..818d98df4d 100644
--- a/lib/auth_srp.c
+++ b/lib/auth_srp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/auth_srp.h b/lib/auth_srp.h
index 6d82844c43..7438d9bcae 100644
--- a/lib/auth_srp.h
+++ b/lib/auth_srp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/auth_srp_passwd.c b/lib/auth_srp_passwd.c
index 46daf24e78..dec8531693 100644
--- a/lib/auth_srp_passwd.c
+++ b/lib/auth_srp_passwd.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/auth_srp_passwd.h b/lib/auth_srp_passwd.h
index 8baf03df85..813e59d003 100644
--- a/lib/auth_srp_passwd.h
+++ b/lib/auth_srp_passwd.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/auth_srp_rsa.c b/lib/auth_srp_rsa.c
index 23d8e0d6a7..0603732457 100644
--- a/lib/auth_srp_rsa.c
+++ b/lib/auth_srp_rsa.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/auth_srp_sb64.c b/lib/auth_srp_sb64.c
index 209b563710..eec0dde356 100644
--- a/lib/auth_srp_sb64.c
+++ b/lib/auth_srp_sb64.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/cipher-libgcrypt.c b/lib/cipher-libgcrypt.c
index 16aba8dc8d..c70aaad973 100644
--- a/lib/cipher-libgcrypt.c
+++ b/lib/cipher-libgcrypt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Free Software Foundation
+ * Copyright (C) 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/crypto-api.c b/lib/crypto-api.c
index b1ffd3cc53..518ffb898e 100644
--- a/lib/crypto-api.c
+++ b/lib/crypto-api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/crypto.c b/lib/crypto.c
index 6a201e5532..2fae849b89 100644
--- a/lib/crypto.c
+++ b/lib/crypto.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Free Software Foundation
+ * Copyright (C) 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/crypto.h b/lib/crypto.h
index 508fce670a..386490e9a3 100644
--- a/lib/crypto.h
+++ b/lib/crypto.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Free Software Foundation
+ * Copyright (C) 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/cryptodev.c b/lib/cryptodev.c
index ae5a05a7fa..058a47e741 100644
--- a/lib/cryptodev.c
+++ b/lib/cryptodev.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Free Software Foundation
+ * Copyright (C) 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/debug.c b/lib/debug.c
index f35fc4eb03..b753e88c05 100644
--- a/lib/debug.c
+++ b/lib/debug.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/debug.h b/lib/debug.h
index 5fd78917c7..586b00cdf0 100644
--- a/lib/debug.h
+++ b/lib/debug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2003, 2004, 2005, 2009 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2003, 2004, 2005, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/ext_cert_type.c b/lib/ext_cert_type.c
index c5a5a352ce..257a128970 100644
--- a/lib/ext_cert_type.c
+++ b/lib/ext_cert_type.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/ext_cert_type.h b/lib/ext_cert_type.h
index 8c99a51359..3d3cc4f853 100644
--- a/lib/ext_cert_type.h
+++ b/lib/ext_cert_type.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/ext_max_record.c b/lib/ext_max_record.c
index 61f5b3264d..cd27a112e4 100644
--- a/lib/ext_max_record.c
+++ b/lib/ext_max_record.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/ext_max_record.h b/lib/ext_max_record.h
index 751bedc824..2afee10c02 100644
--- a/lib/ext_max_record.h
+++ b/lib/ext_max_record.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/ext_oprfi.c b/lib/ext_oprfi.c
index a20d9b3ab1..0f2fb85320 100644
--- a/lib/ext_oprfi.c
+++ b/lib/ext_oprfi.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Free Software Foundation
+ * Copyright (C) 2007 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/lib/ext_oprfi.h b/lib/ext_oprfi.h
index 7f75be9c7e..515c117f73 100644
--- a/lib/ext_oprfi.h
+++ b/lib/ext_oprfi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Free Software Foundation
+ * Copyright (C) 2007 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/lib/ext_safe_renegotiation.c b/lib/ext_safe_renegotiation.c
index 1f30ec979b..2cdae96ad4 100644
--- a/lib/ext_safe_renegotiation.c
+++ b/lib/ext_safe_renegotiation.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Free Software Foundation
+ * Copyright (C) 2009 Free Software Foundation, Inc.
  *
  * Author: Steve Dispensa (<dispensa@phonefactor.com>)
  *
diff --git a/lib/ext_safe_renegotiation.h b/lib/ext_safe_renegotiation.h
index 4b63995797..5f0c4462fc 100644
--- a/lib/ext_safe_renegotiation.h
+++ b/lib/ext_safe_renegotiation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Free Software Foundation
+ * Copyright (C) 2009 Free Software Foundation, Inc.
  *
  * Author: Steve Dispensa (<dispensa@phonefactor.com>)
  *
diff --git a/lib/ext_server_name.c b/lib/ext_server_name.c
index 14ac269396..c506420d84 100644
--- a/lib/ext_server_name.c
+++ b/lib/ext_server_name.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/ext_server_name.h b/lib/ext_server_name.h
index 91e727a152..388d206e34 100644
--- a/lib/ext_server_name.h
+++ b/lib/ext_server_name.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/ext_session_ticket.c b/lib/ext_session_ticket.c
index f25c739173..4f65eb832f 100644
--- a/lib/ext_session_ticket.c
+++ b/lib/ext_session_ticket.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Free Software Foundation
+ * Copyright (C) 2009 Free Software Foundation, Inc.
  *
  * Author: Daiki Ueno
  *
diff --git a/lib/ext_session_ticket.h b/lib/ext_session_ticket.h
index 5f6e29c4fa..3fd8ee670e 100644
--- a/lib/ext_session_ticket.h
+++ b/lib/ext_session_ticket.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Free Software Foundation
+ * Copyright (C) 2009 Free Software Foundation, Inc.
  *
  * Author: Daiki Ueno
  *
diff --git a/lib/ext_signature.c b/lib/ext_signature.c
index 7dcea66866..400c7983e5 100644
--- a/lib/ext_signature.c
+++ b/lib/ext_signature.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005, 2009 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/ext_signature.h b/lib/ext_signature.h
index 3255960b36..8b4360fb1c 100644
--- a/lib/ext_signature.h
+++ b/lib/ext_signature.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/ext_srp.c b/lib/ext_srp.c
index 40f4993487..6950a2da95 100644
--- a/lib/ext_srp.c
+++ b/lib/ext_srp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/ext_srp.h b/lib/ext_srp.h
index 9bc3568d49..5ad7348f8d 100644
--- a/lib/ext_srp.h
+++ b/lib/ext_srp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gl/tests/test-memchr.c b/lib/gl/tests/test-memchr.c
index 5d31e76f27..97d9c52426 100644
--- a/lib/gl/tests/test-memchr.c
+++ b/lib/gl/tests/test-memchr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2009 Free Software Foundation
+ * Copyright (C) 2008-2009 Free Software Foundation, Inc.
  * Written by Eric Blake and Bruno Haible
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/lib/gl/tests/test-read-file.c b/lib/gl/tests/test-read-file.c
index 2509680bae..6829205946 100644
--- a/lib/gl/tests/test-read-file.c
+++ b/lib/gl/tests/test-read-file.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2007 Free Software Foundation
+ * Copyright (C) 2006-2007 Free Software Foundation, Inc.
  * Written by Simon Josefsson
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/lib/gl/tests/test-sockets.c b/lib/gl/tests/test-sockets.c
index 2d259649cd..f74329c700 100644
--- a/lib/gl/tests/test-sockets.c
+++ b/lib/gl/tests/test-sockets.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2009 Free Software Foundation
+ * Copyright (C) 2008, 2009 Free Software Foundation, Inc.
  * Written by Simon Josefsson.
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/lib/gnutls_alert.c b/lib/gnutls_alert.c
index fa99a27eb2..8e4ac4f22c 100644
--- a/lib/gnutls_alert.c
+++ b/lib/gnutls_alert.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_algorithms.c b/lib/gnutls_algorithms.c
index 35899ea4e2..e398df6c4b 100644
--- a/lib/gnutls_algorithms.c
+++ b/lib/gnutls_algorithms.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_algorithms.h b/lib/gnutls_algorithms.h
index 307da61626..3d38d2b988 100644
--- a/lib/gnutls_algorithms.h
+++ b/lib/gnutls_algorithms.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_anon_cred.c b/lib/gnutls_anon_cred.c
index c09730069a..bafd6766b2 100644
--- a/lib/gnutls_anon_cred.c
+++ b/lib/gnutls_anon_cred.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2004, 2005, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2001, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_auth.c b/lib/gnutls_auth.c
index 999aa20eb5..4730f51064 100644
--- a/lib/gnutls_auth.c
+++ b/lib/gnutls_auth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_auth.h b/lib/gnutls_auth.h
index e867a13f87..da2f6b80be 100644
--- a/lib/gnutls_auth.h
+++ b/lib/gnutls_auth.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c
index 77820f2419..d6effe2c58 100644
--- a/lib/gnutls_buffers.c
+++ b/lib/gnutls_buffers.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_buffers.h b/lib/gnutls_buffers.h
index a8ffa7d679..2a92538e01 100644
--- a/lib/gnutls_buffers.h
+++ b/lib/gnutls_buffers.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index a303a07314..4e355dc326 100644
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_cert.h b/lib/gnutls_cert.h
index c153607d3f..07beffc2b4 100644
--- a/lib/gnutls_cert.h
+++ b/lib/gnutls_cert.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c
index 5eb71bde7d..cc9d38e428 100644
--- a/lib/gnutls_cipher.c
+++ b/lib/gnutls_cipher.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_cipher.h b/lib/gnutls_cipher.h
index 0279e859ae..e4181e7736 100644
--- a/lib/gnutls_cipher.h
+++ b/lib/gnutls_cipher.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_cipher_int.c b/lib/gnutls_cipher_int.c
index a973973403..b4b4a54d9e 100644
--- a/lib/gnutls_cipher_int.c
+++ b/lib/gnutls_cipher_int.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2010 Free Software Foundation
+ * Copyright (C) 2009, 2010 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_cipher_int.h b/lib/gnutls_cipher_int.h
index ab6db0479d..4f8fc3194c 100644
--- a/lib/gnutls_cipher_int.h
+++ b/lib/gnutls_cipher_int.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_compress.c b/lib/gnutls_compress.c
index c81d065a13..73e3e27256 100644
--- a/lib/gnutls_compress.c
+++ b/lib/gnutls_compress.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2004, 2005, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_compress.h b/lib/gnutls_compress.h
index 8a3b2641c2..5d1f044c46 100644
--- a/lib/gnutls_compress.h
+++ b/lib/gnutls_compress.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_constate.c b/lib/gnutls_constate.c
index 4fe6e49581..41e3d7ab37 100644
--- a/lib/gnutls_constate.c
+++ b/lib/gnutls_constate.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008  Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008  Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_constate.h b/lib/gnutls_constate.h
index f58c8b1486..68076dddf2 100644
--- a/lib/gnutls_constate.h
+++ b/lib/gnutls_constate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_datum.c b/lib/gnutls_datum.c
index d374ca1e23..55661efd09 100644
--- a/lib/gnutls_datum.c
+++ b/lib/gnutls_datum.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_datum.h b/lib/gnutls_datum.h
index 516d64e398..1ee8b11122 100644
--- a/lib/gnutls_datum.h
+++ b/lib/gnutls_datum.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_db.c b/lib/gnutls_db.c
index 66e214150a..3f71ca9441 100644
--- a/lib/gnutls_db.c
+++ b/lib/gnutls_db.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_db.h b/lib/gnutls_db.h
index 9adece4ea1..ad3bd8bf74 100644
--- a/lib/gnutls_db.h
+++ b/lib/gnutls_db.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_dh.c b/lib/gnutls_dh.c
index 516d10a0e4..3760deef87 100644
--- a/lib/gnutls_dh.c
+++ b/lib/gnutls_dh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_dh.h b/lib/gnutls_dh.h
index d9ab4153a6..0e17e0e6b4 100644
--- a/lib/gnutls_dh.h
+++ b/lib/gnutls_dh.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_dh_primes.c b/lib/gnutls_dh_primes.c
index 90436bb026..8a3c5711db 100644
--- a/lib/gnutls_dh_primes.c
+++ b/lib/gnutls_dh_primes.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_errors.c b/lib/gnutls_errors.c
index 086386c4f1..b4a1177ae8 100644
--- a/lib/gnutls_errors.c
+++ b/lib/gnutls_errors.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_errors.h b/lib/gnutls_errors.h
index 6f47169b96..a1d8ac2ef5 100644
--- a/lib/gnutls_errors.h
+++ b/lib/gnutls_errors.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_extensions.c b/lib/gnutls_extensions.c
index 24b3f4d6c4..a1afc5f42d 100644
--- a/lib/gnutls_extensions.c
+++ b/lib/gnutls_extensions.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos, Simon Josefsson
  *
diff --git a/lib/gnutls_extensions.h b/lib/gnutls_extensions.h
index cb672e34fb..3bceaf00a1 100644
--- a/lib/gnutls_extensions.h
+++ b/lib/gnutls_extensions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_global.c b/lib/gnutls_global.c
index 3f5a154c25..aeb48b5d16 100644
--- a/lib/gnutls_global.c
+++ b/lib/gnutls_global.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_global.h b/lib/gnutls_global.h
index e53aa22a9a..5bf2b27a85 100644
--- a/lib/gnutls_global.h
+++ b/lib/gnutls_global.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index c0bf83b9b6..47565fa587 100644
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_handshake.h b/lib/gnutls_handshake.h
index 2f484f5a7f..62bc92dc92 100644
--- a/lib/gnutls_handshake.h
+++ b/lib/gnutls_handshake.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_hash_int.c b/lib/gnutls_hash_int.c
index 288de91b14..72caa950a6 100644
--- a/lib/gnutls_hash_int.c
+++ b/lib/gnutls_hash_int.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_hash_int.h b/lib/gnutls_hash_int.h
index 7041665c18..1fbd74a542 100644
--- a/lib/gnutls_hash_int.h
+++ b/lib/gnutls_hash_int.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_helper.c b/lib/gnutls_helper.c
index 68bae1b7f5..a2c3c813ad 100644
--- a/lib/gnutls_helper.c
+++ b/lib/gnutls_helper.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2008 Free Software Foundation
+ * Copyright (C) 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index f95ec34441..f1982224a5 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_kx.c b/lib/gnutls_kx.c
index d1c985c0b1..e18a21cf8e 100644
--- a/lib/gnutls_kx.c
+++ b/lib/gnutls_kx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2004, 2005, 2006, 2008  Free Software Foundation
+ * Copyright (C) 2000, 2001, 2004, 2005, 2006, 2008  Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_kx.h b/lib/gnutls_kx.h
index 45ba68bdec..bbf16c23dc 100644
--- a/lib/gnutls_kx.h
+++ b/lib/gnutls_kx.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_mem.c b/lib/gnutls_mem.c
index 31148f2a75..c662158194 100644
--- a/lib/gnutls_mem.c
+++ b/lib/gnutls_mem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_mem.h b/lib/gnutls_mem.h
index 8f32701de4..733b22e0ce 100644
--- a/lib/gnutls_mem.h
+++ b/lib/gnutls_mem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_mpi.c b/lib/gnutls_mpi.c
index 8a71b0a636..8d41ffa69b 100644
--- a/lib/gnutls_mpi.c
+++ b/lib/gnutls_mpi.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_mpi.h b/lib/gnutls_mpi.h
index 7078145a35..1a72a5901a 100644
--- a/lib/gnutls_mpi.h
+++ b/lib/gnutls_mpi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_num.c b/lib/gnutls_num.c
index d30fe9e0fc..c932efd87a 100644
--- a/lib/gnutls_num.c
+++ b/lib/gnutls_num.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_num.h b/lib/gnutls_num.h
index 6ec63cae91..db7568c129 100644
--- a/lib/gnutls_num.h
+++ b/lib/gnutls_num.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_pk.c b/lib/gnutls_pk.c
index ccd98a4a57..f389819ee9 100644
--- a/lib/gnutls_pk.c
+++ b/lib/gnutls_pk.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_pk.h b/lib/gnutls_pk.h
index bee5fae0e3..29168303cb 100644
--- a/lib/gnutls_pk.h
+++ b/lib/gnutls_pk.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index a489166caf..96e2715e52 100644
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_psk.c b/lib/gnutls_psk.c
index 71b5ad2504..2b71b321bd 100644
--- a/lib/gnutls_psk.c
+++ b/lib/gnutls_psk.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_psk_netconf.c b/lib/gnutls_psk_netconf.c
index 967a964279..a192a720a1 100644
--- a/lib/gnutls_psk_netconf.c
+++ b/lib/gnutls_psk_netconf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Free Software Foundation
+ * Copyright (C) 2008 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index 9df7128096..863b0c2107 100644
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_record.h b/lib/gnutls_record.h
index fd8765d03e..96c90d3124 100644
--- a/lib/gnutls_record.h
+++ b/lib/gnutls_record.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_rsa_export.c b/lib/gnutls_rsa_export.c
index 3a606b42fd..f89a310e36 100644
--- a/lib/gnutls_rsa_export.c
+++ b/lib/gnutls_rsa_export.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_rsa_export.h b/lib/gnutls_rsa_export.h
index 4fb85ea14d..cad2148ab6 100644
--- a/lib/gnutls_rsa_export.h
+++ b/lib/gnutls_rsa_export.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_session.c b/lib/gnutls_session.c
index 864f09c16d..2179af8535 100644
--- a/lib/gnutls_session.c
+++ b/lib/gnutls_session.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2000, 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_session_pack.c b/lib/gnutls_session_pack.c
index 3d731348c2..c8817e7631 100644
--- a/lib/gnutls_session_pack.c
+++ b/lib/gnutls_session_pack.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2004, 2005, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2000, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_session_pack.h b/lib/gnutls_session_pack.h
index 93dd32deb7..89a1152fd1 100644
--- a/lib/gnutls_session_pack.h
+++ b/lib/gnutls_session_pack.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_sig.c b/lib/gnutls_sig.c
index f75a705ac6..186e3f26b4 100644
--- a/lib/gnutls_sig.c
+++ b/lib/gnutls_sig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2001, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_sig.h b/lib/gnutls_sig.h
index 53e27ca956..3ca93c0fa5 100644
--- a/lib/gnutls_sig.h
+++ b/lib/gnutls_sig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_srp.c b/lib/gnutls_srp.c
index 3131083596..ffb9243bca 100644
--- a/lib/gnutls_srp.c
+++ b/lib/gnutls_srp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_srp.h b/lib/gnutls_srp.h
index 7cf2c14b5c..cdb81d0015 100644
--- a/lib/gnutls_srp.h
+++ b/lib/gnutls_srp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_state.c b/lib/gnutls_state.c
index 3838efa7f9..82cd1fb584 100644
--- a/lib/gnutls_state.c
+++ b/lib/gnutls_state.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_state.h b/lib/gnutls_state.h
index dc73e8d167..481db77d16 100644
--- a/lib/gnutls_state.h
+++ b/lib/gnutls_state.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_str.c b/lib/gnutls_str.c
index 4586b4b1ce..6dbecafa13 100644
--- a/lib/gnutls_str.c
+++ b/lib/gnutls_str.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2004, 2005, 2007, 2008, 2009  Free Software Foundation
+ * Copyright (C) 2002, 2004, 2005, 2007, 2008, 2009  Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_str.h b/lib/gnutls_str.h
index cf5b2f742d..72da1c050b 100644
--- a/lib/gnutls_str.h
+++ b/lib/gnutls_str.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_supplemental.c b/lib/gnutls_supplemental.c
index 0e9a24c23b..7e13dc51c4 100644
--- a/lib/gnutls_supplemental.c
+++ b/lib/gnutls_supplemental.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007, 2008 Free Software Foundation
+ * Copyright (C) 2007, 2008 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/lib/gnutls_supplemental.h b/lib/gnutls_supplemental.h
index 0b9c1207cf..8888f5997d 100644
--- a/lib/gnutls_supplemental.h
+++ b/lib/gnutls_supplemental.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Free Software Foundation
+ * Copyright (C) 2007 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/lib/gnutls_ui.c b/lib/gnutls_ui.c
index baed5fa556..43257ed054 100644
--- a/lib/gnutls_ui.c
+++ b/lib/gnutls_ui.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_v2_compat.c b/lib/gnutls_v2_compat.c
index 577e949821..d435186943 100644
--- a/lib/gnutls_v2_compat.c
+++ b/lib/gnutls_v2_compat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2004, 2005, 2006, 2008 Free Software Foundation
+ * Copyright (C) 2001, 2004, 2005, 2006, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_v2_compat.h b/lib/gnutls_v2_compat.h
index 59ee61303f..34653c5753 100644
--- a/lib/gnutls_v2_compat.h
+++ b/lib/gnutls_v2_compat.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index 482c7f6964..fe0d4d1720 100644
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/gnutls_x509.h b/lib/gnutls_x509.h
index e1e1ce0dcf..71ca71794b 100644
--- a/lib/gnutls_x509.h
+++ b/lib/gnutls_x509.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/includes/Makefile.am b/lib/includes/Makefile.am
index 8f0e4e90bf..ae05c13066 100644
--- a/lib/includes/Makefile.am
+++ b/lib/includes/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 #
 # Author: Nikos Mavrogiannopoulos
 #
diff --git a/lib/includes/gnutls/crypto.h b/lib/includes/gnutls/crypto.h
index e7a3281a08..ca0cf4f45a 100644
--- a/lib/includes/gnutls/crypto.h
+++ b/lib/includes/gnutls/crypto.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2009 Free Software Foundation
+ * Copyright (C) 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index ea691e6667..394f589604 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -1,5 +1,5 @@
 /* -*- c -*-
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavroyanopoulos
  *
diff --git a/lib/includes/gnutls/openpgp.h b/lib/includes/gnutls/openpgp.h
index c75915e93b..1d6e16eec9 100644
--- a/lib/includes/gnutls/openpgp.h
+++ b/lib/includes/gnutls/openpgp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/includes/gnutls/pkcs12.h b/lib/includes/gnutls/pkcs12.h
index c9b250cfb4..670b895512 100644
--- a/lib/includes/gnutls/pkcs12.h
+++ b/lib/includes/gnutls/pkcs12.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h
index 81ae14ddb9..d40244b5f6 100644
--- a/lib/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index a937a928ba..f02c4bd1eb 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -1,5 +1,5 @@
 # libgnutls.map -- libgnutls linker version script.           -*- ld-script -*-
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+# Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #
 # Author: Simon Josefsson
 #
diff --git a/lib/libgnutlsxx.map b/lib/libgnutlsxx.map
index f61d861544..16b57b8dd5 100644
--- a/lib/libgnutlsxx.map
+++ b/lib/libgnutlsxx.map
@@ -1,5 +1,5 @@
 # libgnutlsxx.map -- linker script for libgnutls.              -*- ld-script -*-
-# Copyright (C) 2005, 2006, 2009 Free Software Foundation
+# Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
 #
 # Author: Simon Josefsson
 #
diff --git a/lib/mac-libgcrypt.c b/lib/mac-libgcrypt.c
index e51ea70869..3840add1da 100644
--- a/lib/mac-libgcrypt.c
+++ b/lib/mac-libgcrypt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Free Software Foundation
+ * Copyright (C) 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/minitasn1/Makefile.am b/lib/minitasn1/Makefile.am
index fcf58316ca..9a9bc82000 100644
--- a/lib/minitasn1/Makefile.am
+++ b/lib/minitasn1/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #
 # Author: Nikos Mavrogiannopoulos
 #
diff --git a/lib/minitasn1/coding.c b/lib/minitasn1/coding.c
index ea0c7d9453..a5f07f6449 100644
--- a/lib/minitasn1/coding.c
+++ b/lib/minitasn1/coding.c
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2004, 2006, 2008, 2009 Free Software Foundation
+ *      Copyright (C) 2004, 2006, 2008, 2009 Free Software Foundation, Inc.
  *      Copyright (C) 2002  Fabio Fiorina
  *
  * This file is part of LIBTASN1.
diff --git a/lib/minitasn1/decoding.c b/lib/minitasn1/decoding.c
index af94cea2e5..4e623c41ab 100644
--- a/lib/minitasn1/decoding.c
+++ b/lib/minitasn1/decoding.c
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2004, 2006, 2008, 2009 Free Software Foundation
+ *      Copyright (C) 2004, 2006, 2008, 2009 Free Software Foundation, Inc.
  *      Copyright (C) 2002 Fabio Fiorina
  *
  * This file is part of LIBTASN1.
diff --git a/lib/minitasn1/element.c b/lib/minitasn1/element.c
index 4b4c8384f1..df1470007d 100644
--- a/lib/minitasn1/element.c
+++ b/lib/minitasn1/element.c
@@ -1,5 +1,5 @@
 /*
- *      Copyright (C) 2004, 2006, 2008, 2009 Free Software Foundation
+ *      Copyright (C) 2004, 2006, 2008, 2009 Free Software Foundation, Inc.
  *      Copyright (C) 2000, 2001, 2002, 2003 Fabio Fiorina
  *
  * This file is part of LIBTASN1.
diff --git a/lib/minitasn1/gstr.c b/lib/minitasn1/gstr.c
index 9c0835120b..d6224909e6 100644
--- a/lib/minitasn1/gstr.c
+++ b/lib/minitasn1/gstr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  * Copyright (C) 2002 Nikos Mavroyanopoulos
  *
  * This file is part of LIBTASN1.
diff --git a/lib/minitasn1/libtasn1.h b/lib/minitasn1/libtasn1.h
index cc330c4767..0e9d492900 100644
--- a/lib/minitasn1/libtasn1.h
+++ b/lib/minitasn1/libtasn1.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  * Copyright (C) 2002 Fabio Fiorina
  *
  * This file is part of LIBTASN1.
diff --git a/lib/minitasn1/parser_aux.c b/lib/minitasn1/parser_aux.c
index 98af5d6da8..2cef2960c1 100644
--- a/lib/minitasn1/parser_aux.c
+++ b/lib/minitasn1/parser_aux.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  * Copyright (C) 2000,2001 Fabio Fiorina
  *
  * This file is part of LIBTASN1.
diff --git a/lib/minitasn1/structure.c b/lib/minitasn1/structure.c
index 39316516df..48a18b82fa 100644
--- a/lib/minitasn1/structure.c
+++ b/lib/minitasn1/structure.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  * Copyright (C) 2002  Fabio Fiorina
  *
  * This file is part of LIBTASN1.
diff --git a/lib/mpi-libgcrypt.c b/lib/mpi-libgcrypt.c
index cf18cded3e..35c7398a3f 100644
--- a/lib/mpi-libgcrypt.c
+++ b/lib/mpi-libgcrypt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/opencdk/Makefile.am b/lib/opencdk/Makefile.am
index 67d94db6c1..32603e5d2a 100644
--- a/lib/opencdk/Makefile.am
+++ b/lib/opencdk/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 #
 # Author: Nikos Mavroyanopoulos
 #
diff --git a/lib/opencdk/hash.c b/lib/opencdk/hash.c
index 21e0d4f859..6ea435d547 100644
--- a/lib/opencdk/hash.c
+++ b/lib/opencdk/hash.c
@@ -1,5 +1,5 @@
 /* hash.c - Hash filters
- * Copyright (C) 2002, 2003, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2007, 2008 Free Software Foundation, Inc.
  *
  * Author: Timo Schulz
  *
diff --git a/lib/openpgp/Makefile.am b/lib/openpgp/Makefile.am
index 4797e86863..16f026dee7 100644
--- a/lib/openpgp/Makefile.am
+++ b/lib/openpgp/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #
 # Author: Nikos Mavrogiannopoulos
 #
diff --git a/lib/openpgp/compat.c b/lib/openpgp/compat.c
index b84be93310..c0095ea93c 100644
--- a/lib/openpgp/compat.c
+++ b/lib/openpgp/compat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Timo Schulz, Nikos Mavrogiannopoulos
  *
diff --git a/lib/openpgp/extras.c b/lib/openpgp/extras.c
index bf0ec39733..a6f61d8e86 100644
--- a/lib/openpgp/extras.c
+++ b/lib/openpgp/extras.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos, Timo Schulz
  *
diff --git a/lib/openpgp/gnutls_openpgp.c b/lib/openpgp/gnutls_openpgp.c
index 0f2a9e059e..b3c42dbbaf 100644
--- a/lib/openpgp/gnutls_openpgp.c
+++ b/lib/openpgp/gnutls_openpgp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Timo Schulz, Nikos Mavrogiannopoulos
  *
diff --git a/lib/openpgp/output.c b/lib/openpgp/output.c
index 58a6a1ab4d..628949ae73 100644
--- a/lib/openpgp/output.c
+++ b/lib/openpgp/output.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson, Nikos Mavrogiannopoulos
  *
diff --git a/lib/openpgp/pgp.c b/lib/openpgp/pgp.c
index ee97c1e778..d0e653947d 100644
--- a/lib/openpgp/pgp.c
+++ b/lib/openpgp/pgp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Timo Schulz, Nikos Mavrogiannopoulos
  *
diff --git a/lib/openpgp/pgpverify.c b/lib/openpgp/pgpverify.c
index df1907b142..89427bf11d 100644
--- a/lib/openpgp/pgpverify.c
+++ b/lib/openpgp/pgpverify.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
  *
  * Author: Timo Schulz, Nikos Mavrogiannopoulos
  *
diff --git a/lib/openpgp/privkey.c b/lib/openpgp/privkey.c
index b6180fc99e..ee5a91a0f7 100644
--- a/lib/openpgp/privkey.c
+++ b/lib/openpgp/privkey.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/pk-libgcrypt.c b/lib/pk-libgcrypt.c
index 330fbfb3a8..bd9b000f95 100644
--- a/lib/pk-libgcrypt.c
+++ b/lib/pk-libgcrypt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/random.c b/lib/random.c
index 9799869f3b..5322ca1bd0 100644
--- a/lib/random.c
+++ b/lib/random.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Free Software Foundation
+ * Copyright (C) 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/random.h b/lib/random.h
index 68b98c8407..6c13182854 100644
--- a/lib/random.h
+++ b/lib/random.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Free Software Foundation
+ * Copyright (C) 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/rnd-libgcrypt.c b/lib/rnd-libgcrypt.c
index 24480a3625..482135f430 100644
--- a/lib/rnd-libgcrypt.c
+++ b/lib/rnd-libgcrypt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Free Software Foundation
+ * Copyright (C) 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am
index dea2b23e93..c47a98a251 100644
--- a/lib/x509/Makefile.am
+++ b/lib/x509/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #
 # This file is part of GNUTLS.
 #
diff --git a/lib/x509/common.c b/lib/x509/common.c
index d3ca210044..b01a1a73d4 100644
--- a/lib/x509/common.c
+++ b/lib/x509/common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/x509/common.h b/lib/x509/common.h
index a819882fc4..81be2836e6 100644
--- a/lib/x509/common.h
+++ b/lib/x509/common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/x509/crl.c b/lib/x509/crl.c
index 5138f0a465..c770871d7e 100644
--- a/lib/x509/crl.c
+++ b/lib/x509/crl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/x509/crl_write.c b/lib/x509/crl_write.c
index 293a6d6042..4920763980 100644
--- a/lib/x509/crl_write.c
+++ b/lib/x509/crl_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/x509/crq.c b/lib/x509/crq.c
index 0702a2c186..550d2a0027 100644
--- a/lib/x509/crq.c
+++ b/lib/x509/crq.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/x509/dn.c b/lib/x509/dn.c
index 89b84bd34b..7136b1089b 100644
--- a/lib/x509/dn.c
+++ b/lib/x509/dn.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009  Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009  Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/x509/extensions.c b/lib/x509/extensions.c
index ac3d0b3b3d..46cd1643ab 100644
--- a/lib/x509/extensions.c
+++ b/lib/x509/extensions.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/x509/mpi.c b/lib/x509/mpi.c
index b26e5399e9..7955fe71c3 100644
--- a/lib/x509/mpi.c
+++ b/lib/x509/mpi.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/x509/output.c b/lib/x509/output.c
index 34bdc6cc51..79513e3c24 100644
--- a/lib/x509/output.c
+++ b/lib/x509/output.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
diff --git a/lib/x509/pkcs12.c b/lib/x509/pkcs12.c
index 18d455d34f..58852949ca 100644
--- a/lib/x509/pkcs12.c
+++ b/lib/x509/pkcs12.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/x509/pkcs12_bag.c b/lib/x509/pkcs12_bag.c
index 42ff1b4e23..8b4a1a4a63 100644
--- a/lib/x509/pkcs12_bag.c
+++ b/lib/x509/pkcs12_bag.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/x509/pkcs7.c b/lib/x509/pkcs7.c
index d017f5ead6..81e42e927b 100644
--- a/lib/x509/pkcs7.c
+++ b/lib/x509/pkcs7.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index 517e287934..833529293c 100644
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c
index 51b940afe0..ca1b6a2cbb 100644
--- a/lib/x509/privkey_pkcs8.c
+++ b/lib/x509/privkey_pkcs8.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/x509/rfc2818_hostname.c b/lib/x509/rfc2818_hostname.c
index f3dadb1f9c..837ee5f245 100644
--- a/lib/x509/rfc2818_hostname.c
+++ b/lib/x509/rfc2818_hostname.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
  * Copyright (C) 2002 Andrew McDonald
  *
  * This file is part of GNUTLS.
diff --git a/lib/x509/sign.c b/lib/x509/sign.c
index 53e223c47e..885af18ad7 100644
--- a/lib/x509/sign.c
+++ b/lib/x509/sign.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/x509/verify.c b/lib/x509/verify.c
index 2f8bc5c100..b3cd27724b 100644
--- a/lib/x509/verify.c
+++ b/lib/x509/verify.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index dfd578752f..04f0382c9e 100644
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  * Author: Nikos Mavrogiannopoulos, Simon Josefsson, Howard Chu
  *
  * This file is part of GNUTLS.
diff --git a/lib/x509/x509_int.h b/lib/x509/x509_int.h
index c749123a07..4e39b52c37 100644
--- a/lib/x509/x509_int.h
+++ b/lib/x509/x509_int.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/x509/x509_write.c b/lib/x509/x509_write.c
index c5b7b13ca5..b6dd7f01c6 100644
--- a/lib/x509/x509_write.c
+++ b/lib/x509/x509_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/x509_b64.c b/lib/x509_b64.c
index 421c261792..6b27a51b23 100644
--- a/lib/x509_b64.c
+++ b/lib/x509_b64.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
diff --git a/lib/x509_b64.h b/lib/x509_b64.h
index 539bec4202..4006385e5b 100644
--- a/lib/x509_b64.h
+++ b/lib/x509_b64.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *