diff --git a/LICENSE b/LICENSE
index 3db9cbce..dea88565 100644
--- a/LICENSE
+++ b/LICENSE
@@ -12,9 +12,9 @@
 *   Earth System Grid Federation (ESGF)                                    *
 *   Data Node Software Stack, Version 1.0                                  *
 *                                                                          *
-*   For details, see http://esgf.org/                                      *
+*   For details, see http://esgf.llnl.gov/                                 *
 *   Please also read this link                                             *
-*    http://esgf.org/LICENSE                                               *
+*   http://esgf.llnl.gov/LICENSE                                           *
 *                                                                          *
 *   * Redistribution and use in source and binary forms, with or           *
 *   without modification, are permitted provided that the following        *
@@ -45,31 +45,31 @@
 *   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT     *
 *   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF     *
 *   SUCH DAMAGE.                                                           *
-*									   *
+*									                                                         *
 ****************************************************************************
 *                                                                          *
 *   Additional BSD Notice:                                                 *
-*									   *
-*   1. This notice is required to be provided under our contract with	   *
-*   the U.S. Department of Energy (DOE). This work was produced at	   *
-*   Lawrence Livermore National Laboratory under Contract		   *
-*   No. DE-AC52-07NA27344 with the DOE. 				   *
-*									   *
-*   2. Neither the United States Government nor Lawrence Livermore	   *
-*   National Security, LLC nor any of their employees, makes any	   *
-*   warranty, express or implied, or assumes any liability or		   *
+*									                                                         *
+*   1. This notice is required to be provided under our contract with	     *
+*   the U.S. Department of Energy (DOE). This work was produced at	       *
+*   Lawrence Livermore National Laboratory under Contract		               *
+*   No. DE-AC52-07NA27344 with the DOE. 				                           *
+*									                                                         *
+*   2. Neither the United States Government nor Lawrence Livermore	       *
+*   National Security, LLC nor any of their employees, makes any	         *
+*   warranty, express or implied, or assumes any liability or		           *
 *   responsibility for the accuracy, completeness, or usefulness of any	   *
-*   information, apparatus, product, or process disclosed, or		   *
+*   information, apparatus, product, or process disclosed, or		           *
 *   represents that its use would not infringe privately-owned rights.	   *
-*									   *
-*   3. Also, reference herein to any specific commercial products,	   *
-*   process, or services by trade name, trademark, manufacturer or	   *
+*									                                                         *
+*   3. Also, reference herein to any specific commercial products,	       *
+*   process, or services by trade name, trademark, manufacturer or	       *
 *   otherwise does not necessarily constitute or imply its endorsement,	   *
-*   recommendation, or favoring by the United States Government or	   *
-*   Lawrence Livermore National Security, LLC. The views and opinions	   *
-*   of authors expressed herein do not necessarily state or reflect	   *
-*   those of the United States Government or Lawrence Livermore		   *
-*   National Security, LLC, and shall not be used for advertising or	   *
-*   product endorsement purposes.					   *
-*									   *
+*   recommendation, or favoring by the United States Government or	       *
+*   Lawrence Livermore National Security, LLC. The views and opinions	     *
+*   of authors expressed herein do not necessarily state or reflect	       *
+*   those of the United States Government or Lawrence Livermore		         *
+*   National Security, LLC, and shall not be used for advertising or	     *
+*   product endorsement purposes.					                                 *
+*									                                                         *
 ***************************************************************************/
diff --git a/bin/esg-web-fe b/bin/esg-web-fe
index fcf95dc1..996e7b3b 100755
--- a/bin/esg-web-fe
+++ b/bin/esg-web-fe
@@ -14,9 +14,9 @@
 #*   All rights reserved. This file is part of the:                         *
 #*   Earth System Grid Fed (ESGF) Node Software Stack, Version 1.0          *
 #*                                                                          *
-#*   For details, see http://esgf.org/                                      *
+#*   For details, see http://esgf.llnl.gov/                                 *
 #*   Please also read this link                                             *
-#*    http://esgf.org/LICENSE                                               *
+#*    http://esgf.llnl.gov/LICENSE                                          *
 #*                                                                          *
 #*   * Redistribution and use in source and binary forms, with or           *
 #*   without modification, are permitted provided that the following        *
diff --git a/build.xml b/build.xml
index b0fc71de..3070c732 100644
--- a/build.xml
+++ b/build.xml
@@ -668,7 +668,7 @@ Builds the project via ant (obviously).
       </packageset>
 
       <doctitle><![CDATA[<h1>${module}</h1>]]></doctitle>
-      <bottom><![CDATA[<i><a href="http://esgf.org/" target="_top">ESGF</a> / <a href="http://esgf.org/LICENSE" target="_top">BSD OpenSource License</a></i>]]></bottom>
+      <bottom><![CDATA[<i><a href="http://esgf.llnl.gov/" target="_top">ESGF</a> / <a href="http://esgf.llnl.gov/LICENSE" target="_top">BSD OpenSource License</a></i>]]></bottom>
       <tag name="todo" scope="all" description="To do:"/>
       <group title="ESGF Core Packages" packages="esgf.xxx.core*"/>
       <group title="ESGF Component Packages" packages="esgf.xxx.components*"/>
@@ -722,7 +722,7 @@ Builds the project via ant (obviously).
     <echo message="Dependency Report -> file://${lib_deps_reports_dir}/esgf-${module}-default.html"/>
     <echo message="Unit Test Report  -> file://${test_reports_dir}/index.html"/>
     <echo message="Coverage Report   -> file://${test_coverage_dir}/index.html"/>
-    <echo message="Web Site ----------> http://esgf.org/${module}-site/index.html"/>
+    <echo message="Web Site ----------> http://esgf.llnl.gov/${module}-site/index.html"/>
   </target>
 
 
@@ -733,7 +733,7 @@ Builds the project via ant (obviously).
     -->
   <target name="post_docs"  depends="init" description="(posts generated documentatoin to web server)">
     <property name="orig.dir" value="${doc_dir_generated}"/>
-    <property name="dest.server" value="esgf.org"/>
+    <property name="dest.server" value="esgf.llnl.gov"/>
     <property name="dest.dir" value="www/${module}-site/"/>
     
     <echo message="orig.dir      = ${orig.dir} "/>
diff --git a/docs/header b/docs/header
index 093296d8..c095e442 100644
--- a/docs/header
+++ b/docs/header
@@ -12,9 +12,9 @@
 *   Earth System Grid Federation (ESGF)                                    *
 *   Data Node Software Stack, Version 1.0                                  *
 *                                                                          *
-*   For details, see http://esgf.org/esg-node-site/                        *
+*   For details, see http://esgf.llnl.gov/esg-node-site/                   *
 *   Please also read this link                                             *
-*    http://esgf.org/LICENSE                                               *
+*    http://esgf.llnl.gov/LICENSE                                          *
 *                                                                          *
 *   * Redistribution and use in source and binary forms, with or           *
 *   without modification, are permitted provided that the following        *
diff --git a/etc/esgf-web-fe.ant.properties b/etc/esgf-web-fe.ant.properties
index 89341407..ba20939d 100644
--- a/etc/esgf-web-fe.ant.properties
+++ b/etc/esgf-web-fe.ant.properties
@@ -11,9 +11,9 @@
 #*   All rights reserved. This file is part of the:                         *
 #*   Earth System Grid (ESG) Data Node Software Stack, Version 1.0          *
 #*                                                                          *
-#*   For details, see http://esgf.org/esg-node/                    *
+#*   For details, see http://esgf.llnl.gov/esg-node/                        *
 #*   Please also read this link                                             *
-#*    http://esgf.org/LICENSE                                      *
+#*   http://esgf.llnl.gov/LICENSE                                           *
 #*                                                                          *
 #*   * Redistribution and use in source and binary forms, with or           *
 #*   without modification, are permitted provided that the following        *
diff --git a/src/java/main/org/esgf/accounts/RegisterForGroupsController.java b/src/java/main/org/esgf/accounts/RegisterForGroupsController.java
index fa45bc81..05b316bd 100644
--- a/src/java/main/org/esgf/accounts/RegisterForGroupsController.java
+++ b/src/java/main/org/esgf/accounts/RegisterForGroupsController.java
@@ -130,7 +130,7 @@ public RegisterForGroupsController() throws FileNotFoundException, IOException {
         
         LOG.debug("RegisterForGroupsController -->" + userName);
         
-        String startOF = "<esgf:registrationRequest xmlns:esgf=\"http://www.esgf.org/\">";
+        String startOF = "<esgf:registrationRequest xmlns:esgf=\"http://www.esgf.llnl.gov/\">";
         String userStart = "<esgf:user>";
         String userEnd = "</esgf:user>";
         String groupStart = "<esgf:group>";
@@ -150,7 +150,7 @@ public RegisterForGroupsController() throws FileNotFoundException, IOException {
             System.out.println("About to call: " + regURL + "\n");
             int result = httpclient.executeMethod(post);
             /* status code: 200 -> ok; 500 -> internal server error */
-            /* <esgf:registrationResponse xmlns:esgf="http://www.esgf.org/" >
+            /* <esgf:registrationResponse xmlns:esgf="http://www.esgf.llnl.gov/" >
              * <esgf:result >
              * SUCCESS</esgf:result >
              * <esgf:message >
diff --git a/web/WEB-INF/views/common/footer.jsp b/web/WEB-INF/views/common/footer.jsp
index d95885bd..e2acdaac 100644
--- a/web/WEB-INF/views/common/footer.jsp
+++ b/web/WEB-INF/views/common/footer.jsp
@@ -34,7 +34,7 @@
 	
 	<div class="prepend-1 span-8 last">
 		<div class="footerright">
-      <a href="https://www.llnl.gov/disclaimer.html">Privacy & Legal Notices</a> | <a href="mailto:esgf-user@lists.llnl.gov?subject=ESGF Portal Feedback">Contact ESGF</a> | <a href="http://esgf.org">ESGF.org</a> 
+      <a href="https://www.llnl.gov/disclaimer.html">Privacy & Legal Notices</a> | <a href="mailto:esgf-user@lists.llnl.gov?subject=ESGF Portal Feedback">Contact ESGF</a> | <a href="http://esgf.llnl.gov">esgf.llnl.gov</a> 
         </div>
 	</div>
 </div>  
diff --git a/web/WEB-INF/views/help/help.jsp b/web/WEB-INF/views/help/help.jsp
index 73e16804..51673150 100644
--- a/web/WEB-INF/views/help/help.jsp
+++ b/web/WEB-INF/views/help/help.jsp
@@ -17,13 +17,13 @@
   <div style="margin-bottom:15px">
     Welcome to the ESGF User Help Page!  
     We have listed several resources below to improve the User experience.
-    For a more detailed description of ESGF overall, please visit our <a href="http://esgf.org" target="_blank">Wiki</a>.  
+    For a more detailed description of ESGF overall, please visit our <a href="http://esgf.llnl.gov" target="_blank">Wiki</a>.  
     For general questions or feedback, please email us at <a href="mailto:esgf-user@lists.llnl.gov?subject=ESGF General Question">esgf-user@lists.llnl.gov</a>.
   </div>
 
   <!--
   <div style='margin-bottom:15px'>
-    <a href='http://askbot.esgf.org/questions/' target="_blank" style='font-weight:bold'>Askbot</a>
+    <a href='http://askbot-esgf.llnl.gov/questions/' target="_blank" style='font-weight:bold'>Askbot</a>
     <br/>Find, tag or submit a question to our "askbot" forum.  Askbot is an open source question and answer 
     oriented Internet forum similar to Stack Overflow.  Questions are typically resolved much more quickly in this forum than through email.
   </div>