42 files changed, 44 insertions, 44 deletions

diff --git a/plugins/check_apt.c b/plugins/check_apt.c
index daeb7578..bf7bbde8 100644
--- a/plugins/check_apt.c
+++ b/plugins/check_apt.c
@@ -31,7 +31,7 @@
 
 const char *progname = "check_apt";
 const char *copyright = "2006-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "runcmd.h"
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index c5f0d529..2a23487b 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -28,7 +28,7 @@
 
 const char *progname = "check_by_ssh";
 const char *copyright = "2000-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c
index d4e39e0f..b046c14e 100644
--- a/plugins/check_cluster.c
+++ b/plugins/check_cluster.c
@@ -24,7 +24,7 @@
 
 const char *progname = "check_cluster";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_dbi.c b/plugins/check_dbi.c
index 8c4a511d..bd50565b 100644
--- a/plugins/check_dbi.c
+++ b/plugins/check_dbi.c
@@ -31,7 +31,7 @@
 
 const char *progname = "check_dbi";
 const char *copyright = "2011";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index c113d87b..445b04f7 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -34,7 +34,7 @@
 
 const char *progname = "check_dig";
 const char *copyright = "2002-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 04d588fb..906f3de1 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -29,7 +29,7 @@
 const char *progname = "check_disk";
 const char *program_name = "check_disk";  /* Required for coreutils libs */
 const char *copyright = "1999-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 
 #include "common.h"
diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index ac6cfc38..082df2bd 100644
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
@@ -31,7 +31,7 @@
 
 const char *progname = "check_dns";
 const char *copyright = "2000-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_dummy.c b/plugins/check_dummy.c
index 3cfc9ede..ca8e457b 100644
--- a/plugins/check_dummy.c
+++ b/plugins/check_dummy.c
@@ -30,7 +30,7 @@
 
 const char *progname = "check_dummy";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index dad000e6..507c3a05 100644
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -31,7 +31,7 @@
 
 const char *progname = "check_fping";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "popen.h"
diff --git a/plugins/check_game.c b/plugins/check_game.c
index 89bb4b12..9b5f523c 100644
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
@@ -31,7 +31,7 @@
 
 const char *progname = "check_game";
 const char *copyright = "2002-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index 60e922ed..49ee86ee 100644
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -31,7 +31,7 @@
 
 const char *progname = "check_hpjd";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "popen.h"
diff --git a/plugins/check_http.c b/plugins/check_http.c
index c36d916a..0ffb0c18 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -35,7 +35,7 @@
 
 const char *progname = "check_http";
 const char *copyright = "1999-2013";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index 0a8009ab..1f0549c9 100644
--- a/plugins/check_ide_smart.c
+++ b/plugins/check_ide_smart.c
@@ -35,7 +35,7 @@
 
 const char *progname = "check_ide_smart";
 const char *copyright = "1998-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
         
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index b05aca9a..4717885a 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -29,7 +29,7 @@
 /* progname may be check_ldaps */
 char *progname = "check_ldap";
 const char *copyright = "2000-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_load.c b/plugins/check_load.c
index 296a8233..479dc491 100644
--- a/plugins/check_load.c
+++ b/plugins/check_load.c
@@ -30,7 +30,7 @@
 
 const char *progname = "check_load";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index d6162f35..b2467b2e 100644
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
@@ -31,7 +31,7 @@
 
 const char *progname = "check_mrtg";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index a8226514..4e6168d7 100644
--- a/plugins/check_mrtgtraf.c
+++ b/plugins/check_mrtgtraf.c
@@ -34,7 +34,7 @@
 
 const char *progname = "check_mrtgtraf";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 int process_arguments (int, char **);
 int validate_arguments (void);
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index db670e2d..34143206 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -32,7 +32,7 @@
 
 const char *progname = "check_mysql";
 const char *copyright = "1999-2011";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #define SLAVERESULTSIZE 70
 
diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
index 0bb83c3e..edc2ec8c 100644
--- a/plugins/check_mysql_query.c
+++ b/plugins/check_mysql_query.c
@@ -31,7 +31,7 @@
 
 const char *progname = "check_mysql_query";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c
index 4fd6342d..d3891c18 100644
--- a/plugins/check_nagios.c
+++ b/plugins/check_nagios.c
@@ -34,7 +34,7 @@
 
 const char *progname = "check_nagios";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "runcmd.h"
diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index 52bbd1c5..20f0bb54 100644
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -34,7 +34,7 @@
 
 const char *progname = "check_nt";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c
index 16be7c51..85271267 100644
--- a/plugins/check_ntp.c
+++ b/plugins/check_ntp.c
@@ -32,7 +32,7 @@
 
 const char *progname = "check_ntp";
 const char *copyright = "2006-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c
index 76152e17..16cce457 100644
--- a/plugins/check_ntp_peer.c
+++ b/plugins/check_ntp_peer.c
@@ -37,7 +37,7 @@
 
 const char *progname = "check_ntp_peer";
 const char *copyright = "2006-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c
index bbcaa0ba..9db73f79 100644
--- a/plugins/check_ntp_time.c
+++ b/plugins/check_ntp_time.c
@@ -36,7 +36,7 @@
 
 const char *progname = "check_ntp_time";
 const char *copyright = "2006-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index 6ebe8f83..ade37897 100644
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -31,7 +31,7 @@
 
 const char *progname = "check_nwstat";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c
index 95977e91..8bd0eb63 100644
--- a/plugins/check_overcr.c
+++ b/plugins/check_overcr.c
@@ -31,7 +31,7 @@
 
 const char *progname = "check_overcr";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index 324bd5f4..a9ebf81c 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -30,7 +30,7 @@
 
 const char *progname = "check_pgsql";
 const char *copyright = "1999-2011";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index eef2195b..83b907e7 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -30,7 +30,7 @@
 
 const char *progname = "check_ping";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index d20b027f..7ba02e2f 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -34,7 +34,7 @@
 const char *progname = "check_procs";
 const char *program_name = "check_procs";  /* Required for coreutils libs */
 const char *copyright = "2000-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index e54105b0..d42df095 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -30,7 +30,7 @@
 
 const char *progname = "check_radius";
 const char *copyright = "2000-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/check_real.c b/plugins/check_real.c
index 18240f30..2fe4c5ca 100644
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -30,7 +30,7 @@
 
 const char *progname = "check_real";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index d477a51e..27313c4c 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -30,7 +30,7 @@
 
 const char *progname = "check_smtp";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 52ad31ea..34504bf8 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -30,7 +30,7 @@
 
 const char *progname = "check_snmp";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "runcmd.h"
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 6e8a5fc5..1c032a4f 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -30,7 +30,7 @@
 
 const char *progname = "check_ssh";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index 1b2a8dd5..7cbd46b4 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -29,7 +29,7 @@
 
 const char *progname = "check_swap";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "popen.h"
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 6ab82616..89f52cc6 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -30,7 +30,7 @@
 /* progname "check_tcp" changes depending on symlink called */
 char *progname;
 const char *copyright = "1999-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include <ctype.h>
 
diff --git a/plugins/check_time.c b/plugins/check_time.c
index 7ee014e9..719645fc 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -30,7 +30,7 @@
 
 const char *progname = "check_time";
 const char *copyright = "1999-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index 59dcc264..aaf62f07 100644
--- a/plugins/check_ups.c
+++ b/plugins/check_ups.c
@@ -34,7 +34,7 @@
 
 const char *progname = "check_ups";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
diff --git a/plugins/check_users.c b/plugins/check_users.c
index ff2aedd2..04ff5c04 100644
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -32,7 +32,7 @@
 
 const char *progname = "check_users";
 const char *copyright = "2000-2007";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/negate.c b/plugins/negate.c
index ef7d4e03..81a08212 100644
--- a/plugins/negate.c
+++ b/plugins/negate.c
@@ -31,7 +31,7 @@
 
 const char *progname = "negate";
 const char *copyright = "2002-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #define DEFAULT_TIMEOUT 11
 
diff --git a/plugins/urlize.c b/plugins/urlize.c
index 30b2a353..ef2de827 100644
--- a/plugins/urlize.c
+++ b/plugins/urlize.c
@@ -32,7 +32,7 @@
 
 const char *progname = "urlize";
 const char *copyright = "2000-2006";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 #include "common.h"
 #include "utils.h"
diff --git a/plugins/utils.h b/plugins/utils.h
index 4fc942d3..325d6f02 100644
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -193,9 +193,9 @@ char *fperfdata (const char *,
  for THRESHOLD format and examples.\n")
 
 #define UT_SUPPORT _("\n\
-Send email to nagios-users@lists.sourceforge.net if you have questions\n\
-regarding use of this software. To submit patches or suggest improvements,\n\
-send email to nagiosplug-devel@lists.sourceforge.net\n\n")
+Send email to help@nagios-plugins.org if you have questions regarding use\n\
+of this software. To submit patches or suggest improvements, send email to\n\
+devel@nagios-plugins.org\n\n")
 
 #define UT_NOWARRANTY _("\n\
 The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\