56 files changed, 83 insertions, 84 deletions

diff --git a/FAQ b/FAQ
index 4fb8653..fa8a4c2 100644
--- a/FAQ
+++ b/FAQ
@@ -88,4 +88,4 @@ A: You can make it available on NagiosExchange (http://nagiosexchange.org)
    where other people can find it for use.
 
    You can also get feedback on improving the plugin via the 
-   nagiosplug-devel@lists.sourceforge.net mailing list.
+   devel@nagios-plugins.org mailing list.
diff --git a/README b/README
index b3d65de..0f0490e 100644
--- a/README
+++ b/README
@@ -23,14 +23,13 @@ You can check for the latest plugins at:
 
 * <https://www.nagios-plugins.org/>
 
-Send an email to <nagiosplug-help@lists.sourceforge.net> for assistance.
-Please include the OS type and version that you are using.  Also, run the
-plugin with the `-vvv` option and provide the resulting version information.
-Of course, there may be additional diagnostic information required as well.
-Use good judgment.
+Send an email to <help@nagios-plugins.org> for assistance.  Please include
+the OS type and version that you are using.  Also, run the plugin with the
+`-vvv` option and provide the resulting version information.  Of course,
+there may be additional diagnostic information required as well.  Use good
+judgment.
 
-Send an email to <nagiosplug-devel@lists.sourceforge.net> for developer
-discussions.
+Send an email to <devel@nagios-plugins.org> for developer discussions.
 
 For patch submissions and bug reports, please use the appropriate resources
 at <https://github.com/nagios-plugins/nagios-plugins>.
@@ -77,7 +76,7 @@ Installation Instructions
         make install-root
 
 That's it!  If you have any problems or questions, feel free to send an
-email to <nagiosplug-help@lists.sourceforge.net>.
+email to <help@nagios-plugins.org>.
 
 
 License Stuff
diff --git a/SUPPORT b/SUPPORT
index f1705aa..5a2cfeb 100644
--- a/SUPPORT
+++ b/SUPPORT
@@ -7,8 +7,8 @@ http://www.nagios.org/ to track the current status of commercial
 support offerings.
 
 There are two mailing lists associated with Nagios Plugin development:
-'help' (mailto:nagiosplug-help@lists.sourceforge.net), and 'devel'
-(mailto:nagiosplug-devel@lists.sourceforge.net). Unless you are fairly
+'help' (mailto:help@nagios-plugins.org), and 'devel'
+(mailto:devel@nagios-plugins.org). Unless you are fairly
 certain you have found a bug or that you are requesting a new feature,
 please direct support requests to 'help'.
 
@@ -48,8 +48,8 @@ REPORTING BUGS AND SUBMITTING PATCHES
 
 Bug reports, investigations of possible bugs, feature requests, and
 patch submissions should be submitted to the development list at
-mailto:nagiosplug-devel@lists.sourceforge.net. Please raise an issue first 
-in GitHub, otherwise your email is likely to be missed over time.
+mailto:devel@nagios-plugins.org. Please raise an issue first in
+GitHub, otherwise your email is likely to be missed over time.
 
 You should identify the version, preferably in the subject line. 
 However, to best use developer resources, it is suggested that you 
diff --git a/configure.in b/configure.in
index 7e8c810..7db6f53 100644
--- a/configure.in
+++ b/configure.in
@@ -61,7 +61,7 @@ AC_SUBST(SCRIPT_TEST)dnl
 WARRANTY="The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\ncopies of the plugins under the terms of the GNU General Public License.\nFor more information about these matters, see the file named COPYING.\n"
 AC_SUBST(WARRANTY)
 
-SUPPORT="Send email to nagios-users@lists.sourceforge.net if you have questions\nregarding use of this software. To submit patches or suggest improvements,\nsend email to nagiosplug-devel@lists.sourceforge.net.\nPlease include version information with all correspondence (when possible,\nuse output from the --version option of the plugin itself).\n"
+SUPPORT="Send email to help@nagios-plugins.org if you have questions regarding use\nof this software. To submit patches or suggest improvements, send email to\ndevel@nagios-plugins.org. Please include version information with all\ncorrespondence (when possible, use output from the --version option of the\nplugin itself).\n"
 AC_SUBST(SUPPORT)
 
 dnl CGIURL has changed for Nagios with 1.0 beta
diff --git a/nagios-plugins.spec.in b/nagios-plugins.spec.in
index 17a44c3..4b4b7d0 100644
--- a/nagios-plugins.spec.in
+++ b/nagios-plugins.spec.in
@@ -22,8 +22,8 @@ Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
 License: GPL
-URL: http://nagiosplug.sourceforge.net/
-Source0: http://dl.sf.net/sourceforge/nagiosplug/%{name}-%{version}.tar.gz
+URL: https://www.nagios-plugins.org/
+Source0: https://www.nagios-plugins.org/download/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define npdir %{_builddir}/%{name}-%{version}
diff --git a/pkg/solaris/pkginfo.in b/pkg/solaris/pkginfo.in
index 3bed346..36a8631 100644
--- a/pkg/solaris/pkginfo.in
+++ b/pkg/solaris/pkginfo.in
@@ -5,7 +5,7 @@ ARCH="@PKG_ARCH@"
 VERSION="@PACKAGE_VERSION@,REV=@REV_DATESTAMP@"
 CATEGORY="application"
 VENDOR="Nagios Plugin Development Team"
-EMAIL="nagiosplug-devel@lists.sourceforge.net"
+EMAIL="devel@nagios-plugins.org"
 PSTAMP="nag@REV_TIMESTAMP@"
 BASEDIR="/"
 CLASSES="none"
diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index 42eedec..ef9a50c 100644
--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
@@ -35,7 +35,7 @@
 
 const char *progname = "check_dhcp";
 const char *copyright = "2001-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-root/check_icmp.c b/plugins-root/check_icmp.c
index 56685f8..255c531 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -40,7 +40,7 @@
 /* char *progname = "check_icmp"; */
 char *progname;
 const char *copyright = "2005-2008";
-const char *email = "nagiosplug-devel@lists.sourceforge.net";
+const char *email = "devel@nagios-plugins.org";
 
 /** nagios plugins basic includes */
 #include "common.h"
diff --git a/plugins-scripts/check_ifoperstatus.pl b/plugins-scripts/check_ifoperstatus.pl
index 588993b..43e09eb 100755
--- a/plugins-scripts/check_ifoperstatus.pl
+++ b/plugins-scripts/check_ifoperstatus.pl
@@ -22,7 +22,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 #
-# Report bugs to:  nagiosplug-help@lists.sourceforge.net
+# Report bugs to:  help@nagios-plugins.org
 #
 # 11.01.2000 Version 1.0
 #
diff --git a/plugins-scripts/check_mssql.pl b/plugins-scripts/check_mssql.pl
index 9a8fc51..cbf2ae7 100755
--- a/plugins-scripts/check_mssql.pl
+++ b/plugins-scripts/check_mssql.pl
@@ -21,7 +21,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
-# Report bugs to: nagiosplug-help@lists.sourceforge.net
+# Report bugs to: help@nagios-plugins.org
 # 
 #
 
diff --git a/plugins/check_apt.c b/plugins/check_apt.c
index daeb757..bf7bbde 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 c5f0d52..2a23487 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 d4e39e0..b046c14 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 8c4a511..bd50565 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 c113d87..445b04f 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 04d588f..906f3de 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 ac6cfc3..082df2b 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 3cfc9ed..ca8e457 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 dad000e..507c3a0 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 89bb4b1..9b5f523 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 60e922e..49ee86e 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 c36d916..0ffb0c1 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 0a8009a..1f0549c 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 b05aca9..4717885 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 296a823..479dc49 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 d6162f3..b2467b2 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 a822651..4e6168d 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 db670e2..3414320 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 0bb83c3..edc2ec8 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 4fd6342..d3891c1 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 52bbd1c..20f0bb5 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 16be7c5..8527126 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 76152e1..16cce45 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 bbcaa0b..9db73f7 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 6ebe8f8..ade3789 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 95977e9..8bd0eb6 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 324bd5f..a9ebf81 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 eef2195..83b907e 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 d20b027..7ba02e2 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 e54105b..d42df09 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 18240f3..2fe4c5c 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 d477a51..27313c4 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 52ad31e..34504bf 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 6e8a5fc..1c032a4 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 1b2a8dd..7cbd46b 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 6ab8261..89f52cc 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 7ee014e..719645f 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 59dcc26..aaf62f0 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 ff2aedd..04ff5c0 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 ef7d4e0..81a0821 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 30b2a35..ef2de82 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 4fc942d..325d6f0 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\
diff --git a/po/Makevars b/po/Makevars
index 152edec..b786971 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -25,5 +25,5 @@ COPYRIGHT_HOLDER = Nagios Plugin Development Group
 EXTRA_LOCALE_CATEGORIES =
 
 # Email address were to send bug report for the .po translation files
-PACKAGE_BUGREPORT = nagiosplug-devel@lists.sourceforge.net
+PACKAGE_BUGREPORT = devel@nagios-plugins.org
 
diff --git a/po/de.po b/po/de.po
index cb886f9..7ccabff 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nagiosplug\n"
-"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
+"Report-Msgid-Bugs-To: devel@nagios-plugins.org\n"
 "POT-Creation-Date: 2010-07-09 19:30-0400\n"
 "PO-Revision-Date: 2004-12-23 17:46+0100\n"
 "Last-Translator:  <>\n"
@@ -5455,7 +5455,7 @@ msgstr ""
 #: plugins/utils.h:192
 msgid ""
 " See:\n"
-" http://nagiosplug.sourceforge.net/developer-guidelines."
+" https://www.nagios-plugins.org/doc/guidelines.html."
 "html#THRESHOLDFORMAT\n"
 " for THRESHOLD format and examples.\n"
 msgstr ""
@@ -5463,9 +5463,9 @@ msgstr ""
 #: plugins/utils.h:197
 msgid ""
 "\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"
+"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"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 125b51e..d732540 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
+"Report-Msgid-Bugs-To: devel@nagios-plugins.org\n"
 "POT-Creation-Date: 2010-07-09 19:30-0400\n"
 "PO-Revision-Date: 2010-04-21 23:38-0400\n"
 "Last-Translator: Thomas Guyot-Sionnest <dermoth@aei.ca>\n"
@@ -5584,29 +5584,29 @@ msgstr ""
 #: plugins/utils.h:192
 msgid ""
 " See:\n"
-" http://nagiosplug.sourceforge.net/developer-guidelines."
+" https://www.nagios-plugins.org/doc/guidelines.html."
 "html#THRESHOLDFORMAT\n"
 " for THRESHOLD format and examples.\n"
 msgstr ""
 " Voir:\n"
-" http://nagiosplug.sourceforge.net/developer-guidelines."
+" https://www.nagios-plugins.org/doc/guidelines.html."
 "html#THRESHOLDFORMAT\n"
 " pour le format et examples des seuils (THRESHOLD).\n"
 
 #: plugins/utils.h:197
 msgid ""
 "\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"
+"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"
 msgstr ""
 "\n"
-"Envoyez un email à nagios-users@lists.sourceforge.net si vous avez des "
+"Envoyez un email à help@nagios-plugins.org si vous avez des "
 "questions\n"
 "reliées à l'utilisation de ce logiciel. Pour envoyer des patches ou suggérer "
 "des\n"
-"améliorations, envoyez un email à nagiosplug-devel@lists.sourceforge.net\n"
+"améliorations, envoyez un email à devel@nagios-plugins.org\n"
 "\n"
 
 #: plugins/utils.h:202
diff --git a/po/nagios-plugins.pot b/po/nagios-plugins.pot
index 53ccf50..0fb2696 100644
--- a/po/nagios-plugins.pot
+++ b/po/nagios-plugins.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: nagiosplug-devel@lists.sourceforge.net\n"
+"Report-Msgid-Bugs-To: devel@nagios-plugins.org\n"
 "POT-Creation-Date: 2012-02-16 17:35-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -5307,7 +5307,7 @@ msgstr ""
 #: plugins/utils.h:192
 msgid ""
 " See:\n"
-" http://nagiosplug.sourceforge.net/developer-guidelines."
+" https://www.nagios-plugins.org/doc/guidelines.html."
 "html#THRESHOLDFORMAT\n"
 " for THRESHOLD format and examples.\n"
 msgstr ""
@@ -5315,9 +5315,9 @@ msgstr ""
 #: plugins/utils.h:197
 msgid ""
 "\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"
+"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"
 msgstr ""