diff --git a/lib/make_zip_err_str.sh b/lib/make_zip_err_str.sh
old mode 100755
new mode 100644
index d42df49..e51b172
--- a/lib/make_zip_err_str.sh
+++ b/lib/make_zip_err_str.sh
@@ -4,7 +4,7 @@
 #  Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 #
 #  This file is part of libzip, a library to manipulate ZIP archives.
-#  The authors can be contacted at <nih@giga.or.at>
+#  The authors can be contacted at <libzip@nih.at>
 #
 #  Redistribution and use in source and binary forms, with or without
 #  modification, are permitted provided that the following conditions
diff --git a/lib/zip.h b/lib/zip.h
index 9d0d700..adbcbd3 100644
--- a/lib/zip.h
+++ b/lib/zip.h
@@ -6,7 +6,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_add.c b/lib/zip_add.c
index 9702c47..f6bdb2a 100644
--- a/lib/zip_add.c
+++ b/lib/zip_add.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_add_dir.c b/lib/zip_add_dir.c
index 9b3e5dc..493e28d 100644
--- a/lib/zip_add_dir.c
+++ b/lib/zip_add_dir.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_close.c b/lib/zip_close.c
index 5e4cf89..df9c1d1 100644
--- a/lib/zip_close.c
+++ b/lib/zip_close.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_delete.c b/lib/zip_delete.c
index c302fa9..a0545e4 100644
--- a/lib/zip_delete.c
+++ b/lib/zip_delete.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_dirent.c b/lib/zip_dirent.c
index 1a8e9f1..7b95359 100644
--- a/lib/zip_dirent.c
+++ b/lib/zip_dirent.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_entry_free.c b/lib/zip_entry_free.c
index 3dde3de..c50c943 100644
--- a/lib/zip_entry_free.c
+++ b/lib/zip_entry_free.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_entry_new.c b/lib/zip_entry_new.c
index 5d5c048..7059b1b 100644
--- a/lib/zip_entry_new.c
+++ b/lib/zip_entry_new.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_error.c b/lib/zip_error.c
index c6e5aa5..aab7079 100644
--- a/lib/zip_error.c
+++ b/lib/zip_error.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_error_clear.c b/lib/zip_error_clear.c
index 2989bf2..364383e 100644
--- a/lib/zip_error_clear.c
+++ b/lib/zip_error_clear.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_error_get.c b/lib/zip_error_get.c
index 2186c30..6d1c958 100644
--- a/lib/zip_error_get.c
+++ b/lib/zip_error_get.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_error_get_sys_type.c b/lib/zip_error_get_sys_type.c
index de53a1a..6c6f380 100644
--- a/lib/zip_error_get_sys_type.c
+++ b/lib/zip_error_get_sys_type.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_error_strerror.c b/lib/zip_error_strerror.c
index 91c5b83..3d0951c 100644
--- a/lib/zip_error_strerror.c
+++ b/lib/zip_error_strerror.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_error_to_str.c b/lib/zip_error_to_str.c
index 9f8c465..bdba41a 100644
--- a/lib/zip_error_to_str.c
+++ b/lib/zip_error_to_str.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_fclose.c b/lib/zip_fclose.c
index d3d0cf5..8709362 100644
--- a/lib/zip_fclose.c
+++ b/lib/zip_fclose.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_file_error_clear.c b/lib/zip_file_error_clear.c
index 155c5d4..ef6fa10 100644
--- a/lib/zip_file_error_clear.c
+++ b/lib/zip_file_error_clear.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_file_error_get.c b/lib/zip_file_error_get.c
index 4f9f3a4..f20e011 100644
--- a/lib/zip_file_error_get.c
+++ b/lib/zip_file_error_get.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_file_get_offset.c b/lib/zip_file_get_offset.c
index 99e69a7..68f92f1 100644
--- a/lib/zip_file_get_offset.c
+++ b/lib/zip_file_get_offset.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_file_strerror.c b/lib/zip_file_strerror.c
index d8d00f2..9ba70f1 100644
--- a/lib/zip_file_strerror.c
+++ b/lib/zip_file_strerror.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_fopen.c b/lib/zip_fopen.c
index 715bf6b..6e2f724 100644
--- a/lib/zip_fopen.c
+++ b/lib/zip_fopen.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_fopen_index.c b/lib/zip_fopen_index.c
index 179ea98..a330d69 100644
--- a/lib/zip_fopen_index.c
+++ b/lib/zip_fopen_index.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_fread.c b/lib/zip_fread.c
index 7f498d4..3d9d3c2 100644
--- a/lib/zip_fread.c
+++ b/lib/zip_fread.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_free.c b/lib/zip_free.c
index e1c8730..76c3a96 100644
--- a/lib/zip_free.c
+++ b/lib/zip_free.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_get_archive_comment.c b/lib/zip_get_archive_comment.c
index c8d38aa..669eb70 100644
--- a/lib/zip_get_archive_comment.c
+++ b/lib/zip_get_archive_comment.c
@@ -3,7 +3,7 @@
   Copyright (C) 2006-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_get_file_comment.c b/lib/zip_get_file_comment.c
index f704061..adace72 100644
--- a/lib/zip_get_file_comment.c
+++ b/lib/zip_get_file_comment.c
@@ -3,7 +3,7 @@
   Copyright (C) 2006-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_get_name.c b/lib/zip_get_name.c
index 594a37d..8f5050b 100644
--- a/lib/zip_get_name.c
+++ b/lib/zip_get_name.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_get_num_files.c b/lib/zip_get_num_files.c
index 770a911..1d9baa3 100644
--- a/lib/zip_get_num_files.c
+++ b/lib/zip_get_num_files.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_memdup.c b/lib/zip_memdup.c
index ccf6bfc..641125e 100644
--- a/lib/zip_memdup.c
+++ b/lib/zip_memdup.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_name_locate.c b/lib/zip_name_locate.c
index 65670e5..baa6141 100644
--- a/lib/zip_name_locate.c
+++ b/lib/zip_name_locate.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_new.c b/lib/zip_new.c
index c65ff73..c72a604 100644
--- a/lib/zip_new.c
+++ b/lib/zip_new.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_open.c b/lib/zip_open.c
index 54a9796..2d6590f 100644
--- a/lib/zip_open.c
+++ b/lib/zip_open.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_rename.c b/lib/zip_rename.c
index 511d39f..b7d1247 100644
--- a/lib/zip_rename.c
+++ b/lib/zip_rename.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_replace.c b/lib/zip_replace.c
index b79a6c0..6cdb80c 100644
--- a/lib/zip_replace.c
+++ b/lib/zip_replace.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_set_archive_comment.c b/lib/zip_set_archive_comment.c
index a2286e8..343fa54 100644
--- a/lib/zip_set_archive_comment.c
+++ b/lib/zip_set_archive_comment.c
@@ -3,7 +3,7 @@
   Copyright (C) 2006-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_set_file_comment.c b/lib/zip_set_file_comment.c
index 23c48f9..bc1938e 100644
--- a/lib/zip_set_file_comment.c
+++ b/lib/zip_set_file_comment.c
@@ -3,7 +3,7 @@
   Copyright (C) 2006-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_set_name.c b/lib/zip_set_name.c
index 8e4144a..5c7da3d 100644
--- a/lib/zip_set_name.c
+++ b/lib/zip_set_name.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_source_buffer.c b/lib/zip_source_buffer.c
index 4b02434..1e9121c 100644
--- a/lib/zip_source_buffer.c
+++ b/lib/zip_source_buffer.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_source_file.c b/lib/zip_source_file.c
index 5a04d9a..bbaea7e 100644
--- a/lib/zip_source_file.c
+++ b/lib/zip_source_file.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_source_filep.c b/lib/zip_source_filep.c
index 5aeae7a..2189eb6 100644
--- a/lib/zip_source_filep.c
+++ b/lib/zip_source_filep.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_source_free.c b/lib/zip_source_free.c
index ebac71e..7a1632f 100644
--- a/lib/zip_source_free.c
+++ b/lib/zip_source_free.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_source_function.c b/lib/zip_source_function.c
index cea39da..91b183c 100644
--- a/lib/zip_source_function.c
+++ b/lib/zip_source_function.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_source_zip.c b/lib/zip_source_zip.c
index 6842f5d..0768027 100644
--- a/lib/zip_source_zip.c
+++ b/lib/zip_source_zip.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_stat.c b/lib/zip_stat.c
index 3de1f67..df1c0b5 100644
--- a/lib/zip_stat.c
+++ b/lib/zip_stat.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_stat_index.c b/lib/zip_stat_index.c
index 0f45a86..60558e4 100644
--- a/lib/zip_stat_index.c
+++ b/lib/zip_stat_index.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_stat_init.c b/lib/zip_stat_init.c
index f6c68c5..133ad30 100644
--- a/lib/zip_stat_init.c
+++ b/lib/zip_stat_init.c
@@ -3,7 +3,7 @@
   Copyright (C) 2006-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_strerror.c b/lib/zip_strerror.c
index 0c86df4..9ebee14 100644
--- a/lib/zip_strerror.c
+++ b/lib/zip_strerror.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_unchange.c b/lib/zip_unchange.c
index 2588a9d..ed0d4de 100644
--- a/lib/zip_unchange.c
+++ b/lib/zip_unchange.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_unchange_all.c b/lib/zip_unchange_all.c
index f382429..54a7a0d 100644
--- a/lib/zip_unchange_all.c
+++ b/lib/zip_unchange_all.c
@@ -3,7 +3,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_unchange_archive.c b/lib/zip_unchange_archive.c
index 85df6ba..6378e39 100644
--- a/lib/zip_unchange_archive.c
+++ b/lib/zip_unchange_archive.c
@@ -3,7 +3,7 @@
   Copyright (C) 2006-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zip_unchange_data.c b/lib/zip_unchange_data.c
index f8a3f19..6fe89f4 100644
--- a/lib/zip_unchange_data.c
+++ b/lib/zip_unchange_data.c
@@ -5,7 +5,7 @@
   Copyright (C) 1999, 2004 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
diff --git a/lib/zipint.h b/lib/zipint.h
index 66bca7e..f5f7b56 100644
--- a/lib/zipint.h
+++ b/lib/zipint.h
@@ -6,7 +6,7 @@
   Copyright (C) 1999-2007 Dieter Baron and Thomas Klausner
 
   This file is part of libzip, a library to manipulate ZIP archives.
-  The authors can be contacted at <nih@giga.or.at>
+  The authors can be contacted at <libzip@nih.at>
 
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions