diff --git a/README b/README
index 31bae93..f916897 100644
--- a/README
+++ b/README
@@ -79,7 +79,7 @@ This version of ezmlm-web requires the following;
 The version number indicates the version of the module that ezmlm-web was
 developed with. Earlier versions may work, but then they haven't been
 tested. Have a look on http://www.CPAN.org/, http://www.qmail.org/, and
-http://www.ezmlm.org/ for anything you are missing. Of course, newer 
+http://untroubled.org/ezmlm/ for anything you are missing. Of course, newer 
 versions are expected to work as well.
 
 To install perl modules you may use the cpan command line interface.
diff --git a/ezmlm-web.cgi b/ezmlm-web.cgi
index bedb1f4..eade01d 100755
--- a/ezmlm-web.cgi
+++ b/ezmlm-web.cgi
@@ -3076,7 +3076,7 @@ L<ezmlm-web-make-suid(1)>, L<ezmlm(5)>, L<ezmlm-cgi(1)>, L<Mail::Ezmlm(3)>
 
 =item L<http://rucus.ru.ac.za/~guy/ezmlm/>
 
-=item L<http://www.ezmlm.org/>
+=item L<http://untroubled.org/ezmlm/>
 
 =item L<http://www.qmail.org/>
 
diff --git a/template/footer.cs b/template/footer.cs
index 9425055..72c66b7 100644
--- a/template/footer.cs
+++ b/template/footer.cs
@@ -3,7 +3,7 @@
 		<a href="https://systemausfall.org/toolforge/ezmlm-web">ezmlm-web</a>
 		(v<?cs var:html_escape(Config.Version.ezmlm_web) ?>)
 		- <?cs var:html_escape(Lang.Misc.FooterText) ?>
-		<a href="http://www.ezmlm.org/" target="_blank">ezmlm</a>
+		<a href="http://untroubled.org/ezmlm/" target="_blank">ezmlm</a>
 		<br />
 	</div>
 
diff --git a/template/nav.cs b/template/nav.cs
index 1b9a674..38aff21 100644
--- a/template/nav.cs
+++ b/template/nav.cs
@@ -191,7 +191,7 @@
 <?cs /if ?>
 
 	<?cs if:UI.Navigation.Help
-		?><li><a href="http://www.ezmlm.org/ezman/index.html#toc1" target="_blank"
+		?><li><a href="http://untroubled.org/ezmlm/ezman/index.html#toc1" target="_blank"
 		title="<?cs var:html_escape(Lang.Misc.HelpLink) ?>"><?cs
 		var:html_escape(Lang.Menue.Help) ?></a></li><?cs /if ?>