diff --git a/README b/README
index 7bc8f53c5f854cd4c4d50c2924aa254d6f93c964..c792e802fdd8ad3a2314b08a035f032165fb447e 100644
--- a/README
+++ b/README
@@ -28,8 +28,8 @@ First, you need some other things:
 	    Date::Format and Chart::Base available from your nearest
 			CPAN server. See http://www.perl.com/CPAN.
       ftp://ftp.cpan.org/pub/CPAN/authors/id/GBARR/TimeDate-1.08.tar.gz
-      ftp://ftp.cpan.com/pub/CPAN/authors/id/DBONNER/Chart-0.99.tar.gz
-      ftp://ftp.cpan.com/pub/CPAN/authors/id/LDS/GD-1.18.tar.gz
+      ftp://ftp.cpan.org/pub/CPAN/authors/id/DBONNER/Chart-0.99.tar.gz
+      ftp://ftp.cpan.org/pub/CPAN/authors/id/LDS/GD-1.18.tar.gz
    3) Some kind of HTTP server so you could use CGI scripts
 
 Earlier versions of Bugzilla required TCL.  THIS IS NO LONGER TRUE.
diff --git a/reports.cgi b/reports.cgi
index 7456c054edce31632f35748a43fbc13ba3b3f087..410abc105c233c149c5d7c4c76765b5ad4572522 100755
--- a/reports.cgi
+++ b/reports.cgi
@@ -42,7 +42,7 @@ my %reports =
 	"show_chart" => \&show_chart,
 	);
 
-# patch from Sam Ziegler <ziegler@mediaguaranty.com>:
+# patch from Sam Ziegler <sam@ziegler.org>:
 #
 # "reports.cgi currently has it's own idea of what 
 # the header should be. This patch sets it to the