diff --git a/Makefile.in b/Makefile.in
index ec1c1248b..590fb2e78 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -317,7 +317,7 @@ user_doc: $(HDR_FILES_SRC) Doxyfile.user user_doc.head.html $(HELP_SRC) doc.h $(
 #
 
 doc: *.h *.cpp doc.h Doxyfile
-	(cat Doxyfile ; echo PROJECT_NUMBER=@PACKAGE_VERSION@) | doxygen -;
+	(cat Doxyfile ; echo PROJECT_NUMBER=@PACKAGE_VERSION@) | doxygen - ;
 
 
 #
diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in
index 4204a5c76..fc857c506 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 <a
-href="http://ridiculousfish.com/shell/"><code>fish</code> homepage</a>.
+href="http://fishshell.com/"><code>fish</code> homepage</a>.
 
 \section syntax Syntax overview
 
@@ -1375,7 +1375,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 <a href='http://ridiculousfish.com/shell/'>fish
+available from the <a href='http://fishshell.com/'>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 60ca40958..218b71ab3 100644
--- a/fish.spec.in
+++ b/fish.spec.in
@@ -6,7 +6,7 @@ Release:                0%{?dist}
 
 License:                GPL
 Group:                  System Environment/Shells
-URL:                    http://ridiculousfish.com/shell/
+URL:                    http://fishshell.com/
 
 Source0:                http://ridiculousfish.com/shell/files/%{version}/%{name}-%{version}.tar.bz2
 
diff --git a/user_doc.head.html b/user_doc.head.html
index 880e8c027..7ac670ce8 100644
--- a/user_doc.head.html
+++ b/user_doc.head.html
@@ -32,7 +32,7 @@ H4
 
 <div class="qindex">
 
- <a class="qindex" href="http://ridiculousfish.com/shell/"><tt>fish</tt> home</a>
+ <a class="qindex" href="http://fishshell.com/"><tt>fish</tt> home</a>
 |
  <a class="qindex" href="index.html">Main documentation page</a>
 |
diff --git a/wgetopt.cpp b/wgetopt.cpp
index 7052f5ebb..8e114117b 100644
--- a/wgetopt.cpp
+++ b/wgetopt.cpp
@@ -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://ridiculousfish.com/shell/'>the fish homepage</a>. Extract
+  href='http://fishshell.com'>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 4b6536e58..5a03ba33c 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://ridiculousfish.com/shell/'>the fish homepage</a>. Extract
+  href='http://fishshell.com'>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