1 files changed, 21 insertions, 36 deletions

diff --git a/web/input/support.md b/web/input/support.md
index 538f320..60a6428 100644
--- a/web/input/support.md
+++ b/web/input/support.md
@@ -15,39 +15,24 @@ might be relevant!
 
 ## Mailing Lists
 
-<!--%
-# There are four mailing lists for the Nagios Plugins:
-# 
-# * General discussion and support: **<help@nagios-plugins.org>**  
-#   [Subscribe][help-sub] | [Archive][help-arch] | [Gmane][help-gmane]
-# 
-# * Development-related issues: **<devel@nagios-plugins.org>**  
-#   [Subscribe][devel-sub] | [Archive][devel-arch] | [Gmane][devel-gmane]
-# 
-# * Git commits (read-only): **<commits@nagios-plugins.org>**  
-#   [Subscribe][commits-sub] | [Archive][commits-arch] | [Gmane][commits-gmane]
-# 
-# * Announcements (read-only): **<announce@nagios-plugins.org>**  
-#   [Subscribe][announce-sub] | [Archive][announce-arch] | [Gmane][announce-gmane]
-# 
-# Announcements are also sent to the [help][help-sub] and [devel][devel-sub]
-# mailing lists, so the [announce][announce-sub] list is generally only useful
-# if you'd like to be notified of new releases without following any
-# discussions.
-%-->
+There are four mailing lists for the Nagios Plugins:
 
-<!--% # OLD LISTS # %-->
-There are three mailing lists for the Nagios Plugins:
-
-* General discussion and support: **<nagiosplug-help@lists.sourceforge.net>**  
+* General discussion and support: **<help@nagios-plugins.org>**  
   [Subscribe][help-sub] | [Archive][help-arch] | [Gmane][help-gmane]
 
-* Development-related issues: **<nagiosplug-devel@lists.sourceforge.net>**  
+* Development-related issues: **<devel@nagios-plugins.org>**  
   [Subscribe][devel-sub] | [Archive][devel-arch] | [Gmane][devel-gmane]
 
-* Git commits (read-only): **<nagiosplug-checkins@lists.sourceforge.net>**  
+* Git commits (read-only): **<commits@nagios-plugins.org>**  
   [Subscribe][commits-sub] | [Archive][commits-arch] | [Gmane][commits-gmane]
-<!--% # OLD LISTS # %-->
+
+* Announcements (read-only): **<announce@nagios-plugins.org>**  
+  [Subscribe][announce-sub] | [Archive][announce-arch] | [Gmane][announce-gmane]
+
+Announcements are also sent to the [help][help-sub] and [devel][devel-sub]
+mailing lists, so the [announce][announce-sub] list is generally only useful
+if you'd like to be notified of new releases without following any
+discussions.
 
 Be aware that these mailing lists are read by volunteers, so responses may
 take time, if at all.
@@ -66,17 +51,17 @@ developers also hang around in [#Nagios-Devel][nagios-devel-irc].
 [icinga-irc]: http://webchat.freenode.net/?channels=icinga
 [nagios-irc]: http://webchat.freenode.net/?channels=nagios
 [nagios-devel-irc]: http://webchat.freenode.net/?channels=nagios-devel
-[help-sub]: https://lists.sourceforge.net/lists/listinfo/nagiosplug-help
-[help-arch]: https://sourceforge.net/p/nagiosplug/mailman/nagiosplug-help
+[help-sub]: https://www.nagios-plugins.org/list/listinfo/help/
+[help-arch]: https://www.nagios-plugins.org/archive/help/
 [help-gmane]: http://dir.gmane.org/gmane.network.nagios.plugins
-[devel-sub]: https://lists.sourceforge.net/lists/listinfo/nagiosplug-devel
-[devel-arch]: https://sourceforge.net/p/nagiosplug/mailman/nagiosplug-devel
+[devel-sub]: https://www.nagios-plugins.org/list/listinfo/devel/
+[devel-arch]: https://www.nagios-plugins.org/archive/devel/
 [devel-gmane]: http://dir.gmane.org/gmane.network.nagios.plugins.devel
-[commits-sub]: https://lists.sourceforge.net/lists/listinfo/nagiosplug-checkins
-[commits-arch]: https://sourceforge.net/p/nagiosplug/mailman/nagiosplug-checkins
+[commits-sub]: https://www.nagios-plugins.org/list/listinfo/commits/
+[commits-arch]: https://www.nagios-plugins.org/archive/commits/
 [commits-gmane]: http://dir.gmane.org/gmane.network.nagios.plugins.cvs
-[announce-sub]: /fixme
-[announce-arch]: /fixme
-[announce-gmane]: /fixme
+[announce-sub]: https://www.nagios-plugins.org/list/listinfo/announce/
+[announce-arch]: https://www.nagios-plugins.org/archive/announce/
+[announce-gmane]: http://dir.gmane.org/gmane.network.nagios.plugins.announce
 
 <!--% # vim:set filetype=markdown textwidth=78 joinspaces: # %-->