diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in
index 34ed91cb7..b3a671b52 100644
--- a/doc_src/index.hdr.in
+++ b/doc_src/index.hdr.in
@@ -11,7 +11,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 fish
homepage.
+href="http://ridiculousfish.com/shell/">fish
homepage.
\section syntax Syntax overview
@@ -1374,7 +1374,7 @@ translated, a future version of fish should also include translated
manuals.
To make a translation of fish, you will first need the source code,
-available from the fish
+available from the fish
homepage. Download the latest version, and then extract it using a
command like tar -zxf fish-VERSION.tar.gz
.
diff --git a/fish.spec.in b/fish.spec.in
index b16365597..60ca40958 100644
--- a/fish.spec.in
+++ b/fish.spec.in
@@ -6,9 +6,9 @@ Release: 0%{?dist}
License: GPL
Group: System Environment/Shells
-URL: http://www.fishshell.org
+URL: http://ridiculousfish.com/shell/
-Source0: http://www.fishshell.org/files/%{version}/%{name}-%{version}.tar.bz2
+Source0: http://ridiculousfish.com/shell/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 6a7684953..880e8c027 100644
--- a/user_doc.head.html
+++ b/user_doc.head.html
@@ -32,7 +32,7 @@ H4