diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml
index 02dc5f08b1..8e7a20cdff 100644
--- a/en_US.ISO8859-1/articles/committers-guide/article.xml
+++ b/en_US.ISO8859-1/articles/committers-guide/article.xml
@@ -2357,7 +2357,7 @@ ControlPersist yes</screen>
 	</step>
 
 	<step>
-	  <para>Log into <systemitem>hub.FreeBSD.org</systemitem> and
+	  <para>Log into <systemitem>freefall.FreeBSD.org</systemitem> and
 	    create a
 	    <filename>/var/forward/<replaceable>user</replaceable></filename>
 	    (where <replaceable>user</replaceable> is your username)
diff --git a/en_US.ISO8859-1/books/handbook/mail/chapter.xml b/en_US.ISO8859-1/books/handbook/mail/chapter.xml
index 3ebb508775..4efead8892 100644
--- a/en_US.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mail/chapter.xml
@@ -963,7 +963,7 @@ example.FreeBSD.org has address 204.216.27.XX</screen>
 
       <screen>&prompt.root; <userinput>host example.FreeBSD.org</userinput>
 example.FreeBSD.org has address 204.216.27.XX
-example.FreeBSD.org mail is handled (pri=10) by hub.FreeBSD.org</screen>
+example.FreeBSD.org mail is handled (pri=10) by nevdull.FreeBSD.org</screen>
 
       <para>All mail sent to <systemitem
 	  class="fqdomainname">example.FreeBSD.org</systemitem> will
@@ -1020,7 +1020,7 @@ freefall		MX	20	who.cdrom.com</programlisting>
 	<acronym>MX</acronym> record:</para>
 
       <programlisting>example.FreeBSD.org	A	204.216.27.XX		; Workstation
-			MX	10 hub.FreeBSD.org	; Mailhost</programlisting>
+			MX	10 nevdull.FreeBSD.org	; Mailhost</programlisting>
 
       <para>This will redirect mail for the workstation to the
 	<acronym>MTA</acronym> no matter where the A record points.
diff --git a/en_US.ISO8859-1/htdocs/ports/Makefile b/en_US.ISO8859-1/htdocs/ports/Makefile
index 285972b22f..28d73ba8de 100644
--- a/en_US.ISO8859-1/htdocs/ports/Makefile
+++ b/en_US.ISO8859-1/htdocs/ports/Makefile
@@ -25,7 +25,7 @@ ${INDEX}:
 .endif
 
 HOSTNAME!= hostname
-.if ${HOSTNAME} == "hub.freebsd.org" || ${HOSTNAME} == "freefall.freebsd.org" || ${HOSTNAME} == "www.freebsd.org" || ${HOSTNAME} == "build-web.stream.FreeBSD.org"
+.if ${HOSTNAME} == "freefall.freebsd.org" || ${HOSTNAME} == "www.freebsd.org" || ${HOSTNAME} == "build-web.stream.FreeBSD.org"
 CLUSTER_MACHINE=	YES
 .endif
 
diff --git a/en_US.ISO8859-1/htdocs/search/sitemap.xml b/en_US.ISO8859-1/htdocs/search/sitemap.xml
index 31b0a26d7d..3235fb692b 100644
--- a/en_US.ISO8859-1/htdocs/search/sitemap.xml
+++ b/en_US.ISO8859-1/htdocs/search/sitemap.xml
@@ -574,11 +574,6 @@
     <destination>&base;/internal/about.html</destination>
   </term>
 
-  <term>
-    <text>hub.FreeBSD.org</text>
-    <destination>&base;/internal/about.html</destination>
-  </term>
-
   <term>
     <text>BSDi, network connection</text>
     <destination>&base;/internal/about.html</destination>