diff --git a/doc_src/doc.hdr b/doc_src/doc.hdr
index 4e88dc4..5bcca19 100644
--- a/doc_src/doc.hdr
+++ b/doc_src/doc.hdr
@@ -6,7 +6,7 @@ This is the documentation for \c fish, the friendly interactive
 shell. \c fish is a user friendly commandline shell intended
 mostly for interactive use. A shell is a program used to execute other
 programs. For the latest information on \c fish, please visit the <a
-href="http://roo.no-ip.org/fish/"><code>fish</code> homepage</a>.
+href="http://www.fishshell.org"><code>fish</code> homepage</a>.
 
 \section syntax Syntax overview
 
@@ -1213,7 +1213,7 @@ translated, a future version of fish should also include translated
 manuals.
 
 To make a translation of fish, you will first need the sourcecode,
-available from the <a href='http://roo.no-ip.org/fish'>fish
+available from the <a href='http://www.fishshell.org'>fish
 homepage</a>. Download the latest version, and then extract it using a
 command like <code>tar -zxf fish-VERSION.tar.gz</code>.
 
diff --git a/fish.spec.in b/fish.spec.in
index e847e98..34a5205 100644
--- a/fish.spec.in
+++ b/fish.spec.in
@@ -6,9 +6,9 @@ Release:                0%{?dist}
 
 License:                GPL
 Group:                  System Environment/Shells
-URL:                    http://roo.no-ip.org/fish/
+URL:                    http://www.fishshell.org
 
-Source0:                http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2
+Source0:                http://www.fishshell.org/files/%{version}/%{name}-%{version}.tar.bz2
 
 BuildRoot:              %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:          ncurses-devel gettext groff 
diff --git a/user_doc.head.html b/user_doc.head.html
index 5c91918..d721bd2 100644
--- a/user_doc.head.html
+++ b/user_doc.head.html
@@ -20,7 +20,7 @@
 
 <div class="qindex">
 
- <a class="qindex" href="http://roo.no-ip.org/fish/index.html"><tt>fish</tt> home</a> 
+ <a class="qindex" href="http://www.fishshell.org"><tt>fish</tt> home</a> 
 |
  <a class="qindex" href="index.html">Main documentation page</a> 
 |
diff --git a/wgetopt.c b/wgetopt.c
index 1767b9a..8b712d9 100644
--- a/wgetopt.c
+++ b/wgetopt.c
@@ -9,7 +9,7 @@
 
 	If you want to use this version of getopt in your program,
 	download the fish sourcecode, available at <a
-	href='http://roo.no-ip.org/fish/'>the fish homepage</a>. Extract
+	href='http://www.fishshell.org'>the fish homepage</a>. Extract
 	the sourcode, copy wgetopt.c and wgetopt.h into your program
 	directory, include wgetopt.h in your program, and use all the
 	regular getopt functions, prefixing every function, global
diff --git a/wgetopt.h b/wgetopt.h
index 599b353..126b42b 100644
--- a/wgetopt.h
+++ b/wgetopt.h
@@ -9,7 +9,7 @@
 
 	If you want to use this version of getopt in your program,
 	download the fish sourcecode, available at <a
-	href='http://roo.no-ip.org/fish/'>the fish homepage</a>. Extract
+	href='http://www.fishshell.org'>the fish homepage</a>. Extract
 	the sourcode, copy wgetopt.c and wgetopt.h into your program
 	directory, include wgetopt.h in your program, and use all the
 	regular getopt functions, prefixing every function, global