diff --git a/configure.ac b/configure.ac
index 7f9b2fe71..5570b6f05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ m4_syscmd([build_tools/git_version_gen.sh 2>/dev/null])
 AC_PREREQ([2.60])
 AC_INIT(fish,
         m4_esyscmd([cut -f 3 -d ' ' FISH-BUILD-VERSION-FILE | tr -d '\n']),
-        fish-users@lists.sf.net)
+        fish-users@lists.sourceforge.net)
 
 conf_arg=$@
 
diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in
index 34b257553..32d314816 100644
--- a/doc_src/index.hdr.in
+++ b/doc_src/index.hdr.in
@@ -1138,7 +1138,7 @@ If you install fish in your home directory, fish will not work correctly for any
 
 If you have a question not answered by this documentation, there are several avenues for help:
 
--# The official mailing list at <a href='https://lists.sf.net/lists/listinfo/fish-users'>fish-users@lists.sf.net</a>
+-# The official mailing list at <a href='https://lists.sourceforge.net/lists/listinfo/fish-users'>fish-users@lists.sourceforge.net</a>
 
 -# The Internet Relay Chat channel, \#fish on `irc.oftc.net`
 
diff --git a/osx/config.h b/osx/config.h
index 7747dbf5a..450a10cd6 100644
--- a/osx/config.h
+++ b/osx/config.h
@@ -213,7 +213,7 @@
 #define NOMACROS 1
 
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "fish-users@lists.sf.net"
+#define PACKAGE_BUGREPORT "fish-users@lists.sourceforge.net"
 
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "fish"
diff --git a/po/en.po b/po/en.po
index e3be3128b..51e2515d3 100644
--- a/po/en.po
+++ b/po/en.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2015-04-13 22:15+0800\n"
 "PO-Revision-Date: 2014-11-15 09:00+0800\n"
 "Last-Translator: David Adam <zanchey@ucc.gu.uwa.edu.au>\n"
-"Language-Team: English <fish-users@lists.sf.net>\n"
+"Language-Team: English <fish-users@lists.sourceforge.net>\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"