diff --git a/doc/faq.texi b/doc/faq.texi
index 61a670dda3..e070fd2938 100644
--- a/doc/faq.texi
+++ b/doc/faq.texi
@@ -187,14 +187,14 @@ LGPL to GPL.
 @section Why does the chrominance data seem to be sampled at a different time from the luminance data on bt8x8 captures on Linux?
 
 This is a well-known bug in the bt8x8 driver. For 2.4.26 there is a patch at
-(@url{http://svn.mplayerhq.hu/michael/trunk/patches/bttv-420-2.4.26.patch?view=co}). This may also
+(@url{http://svn.ffmpeg.org/michael/trunk/patches/bttv-420-2.4.26.patch?view=co}). This may also
 apply cleanly to other 2.4-series kernels.
 
 @section How do I avoid the ugly aliasing artifacts in bt8x8 captures on Linux?
 
 Pass 'combfilter=1 lumafilter=1' to the bttv driver. Note though that 'combfilter=1'
-will cause somewhat too strong filtering. A fix is to apply (@url{http://svn.mplayerhq.hu/michael/trunk/patches/bttv-comb-2.4.26.patch?view=co})
-or (@url{http://svn.mplayerhq.hu/michael/trunk/patches/bttv-comb-2.6.6.patch?view=co})
+will cause somewhat too strong filtering. A fix is to apply (@url{http://svn.ffmpeg.org/michael/trunk/patches/bttv-comb-2.4.26.patch?view=co})
+or (@url{http://svn.ffmpeg.org/michael/trunk/patches/bttv-comb-2.6.6.patch?view=co})
 and pass 'combfilter=2'.
 
 @section -f jpeg doesn't work.
@@ -469,7 +469,7 @@ see @url{http://www.iversenit.dk/dev/ffmpeg-headers/}
 
 @section Where is the documentation about ffv1, msmpeg4, asv1, 4xm?
 
-see @url{http://svn.mplayerhq.hu/michael/trunk/docs/}
+see @url{http://svn.ffmpeg.org/michael/trunk/docs/}
 
 @section How do I feed H.263-RTP (and other codecs in RTP) to libavcodec?
 
diff --git a/doc/general.texi b/doc/general.texi
index f038ff59bb..b594fe157c 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -1087,7 +1087,7 @@ do not attach several unrelated patches to the same mail.
     If the patch fixes a bug, did you provide enough information, including
     a sample, so the bug can be reproduced and the fix can be verified?
     Note please do not attach samples >100k to mails but rather provide a
-    URL, you can upload to ftp://upload.mplayerhq.hu
+    URL, you can upload to ftp://upload.ffmpeg.org
 @item
     Did you provide a verbose summary about what the patch does change?
 @item
diff --git a/doc/optimization.txt b/doc/optimization.txt
index ddfaecde6e..5469adc836 100644
--- a/doc/optimization.txt
+++ b/doc/optimization.txt
@@ -18,7 +18,7 @@ As many functions tend to be a bit difficult to understand because
 of optimizations, it can be hard to optimize them further, or write
 architecture-specific versions. It is recommended to look at older
 revisions of the interesting files (for a web frontend try ViewVC at
-http://svn.mplayerhq.hu/ffmpeg/trunk/).
+http://svn.ffmpeg.org/ffmpeg/trunk/).
 Alternatively, look into the other architecture-specific versions in
 the x86/, ppc/, alpha/ subdirectories. Even if you don't exactly
 comprehend the instructions, it could help understanding the functions
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index d3c9c2bdd7..f4323da542 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -40,7 +40,7 @@
 
 static const char* sample_message =
     "Please file a bug report following the instructions at "
-    "http://ffmpeg.mplayerhq.hu/bugreports.html and include "
+    "http://ffmpeg.org/bugreports.html and include "
     "a sample of this file.";
 
 typedef struct SubStream {
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index d31a5c7c24..37f23d5372 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1518,7 +1518,7 @@ void ff_log_missing_feature(void *avc, const char *feature, int want_sample)
             "been implemented.", feature);
     if(want_sample)
         av_log(avc, AV_LOG_WARNING, " If you want to help, upload a sample "
-                "of this file to ftp://upload.mplayerhq.hu/MPlayer/incoming/ "
+                "of this file to ftp://upload.ffmpeg.org/MPlayer/incoming/ "
                 "and contact the FFmpeg-devel mailing list.");
     av_log(avc, AV_LOG_WARNING, "\n");
 }