diff --git a/xCAT-client-2.0/pods/man8/makehosts.8.pod b/xCAT-client-2.0/pods/man8/makehosts.8.pod
new file mode 100644
index 000000000..a80008311
--- /dev/null
+++ b/xCAT-client-2.0/pods/man8/makehosts.8.pod
@@ -0,0 +1,52 @@
+=head1 NAME
+
+B<makedns> - sets up /etc/hosts from the xCAT hosts table.
+
+=head1 SYNOPSIS
+
+B<makehosts> [B<-n>] [I<noderange>]
+
+B<makehosts> {B<-h>|B<--help>}
+
+
+=head1 DESCRIPTION
+
+B<makehosts> updates the /etc/hosts file based on entries in the hosts table in the xCAT database.
+If your node hostnames and IP addresses follow a regular pattern, you can use just a few regular expressions
+in the hosts table and then easily generate /etc/hosts using makehosts.
+
+
+=head1 OPTIONS
+
+=over 6
+
+=item B<-n>
+
+Completely replace the /etc/hosts file, losing any previous content.  If this option is not specified,
+it will only replace the lines in the file that correspond to the nodes in the specified noderange.
+
+=back
+
+
+=head1 EXAMPLES
+
+=over 2
+
+=item *
+
+If the xCAT hosts table contains:
+
+  "compute","|node(\d+)|1.2.3.($1+0)|","|(.*)|($1).cluster.net|",,
+
+Assuming the group "compute" contains node01, node02, etc., then in /etc/hosts they will be given
+IP addresses of 1.2.3.1, 1.2.3.2, etc.
+
+=back
+
+=head1 SEE ALSO
+
+hosts(5)
+
+=head1 AUTHOR
+
+Egan Ford E<lt>egan@us.ibm.comE<gt>
\ No newline at end of file
diff --git a/xCAT-client-2.0/share/doc/xCAT2.0RR.odt b/xCAT-client-2.0/share/doc/xCAT2.0RR.odt
index 5f7558f95..0cd3dceef 100644
Binary files a/xCAT-client-2.0/share/doc/xCAT2.0RR.odt and b/xCAT-client-2.0/share/doc/xCAT2.0RR.odt differ
diff --git a/xCAT-client-2.0/share/doc/xCAT2.0RR.pdf b/xCAT-client-2.0/share/doc/xCAT2.0RR.pdf
index 212039c2d..de731923d 100644
Binary files a/xCAT-client-2.0/share/doc/xCAT2.0RR.pdf and b/xCAT-client-2.0/share/doc/xCAT2.0RR.pdf differ
diff --git a/xCAT-server-2.0/etc/init.d/xcatd b/xCAT-server-2.0/etc/init.d/xcatd
index d89e45056..b07cfc7fb 100755
--- a/xCAT-server-2.0/etc/init.d/xcatd
+++ b/xCAT-server-2.0/etc/init.d/xcatd
@@ -11,11 +11,16 @@
 # Short-Description: xCATd
 # Description: xCAT management service
 ### END INIT INFO
+
+# This avoids the perl locale warnings
+if [ -z $LANG ] && [ -z $LC_ALL ]; then
+  export LANG=C
+fi
+
 if [ -r /etc/sysconfig/xcat ]; then
 	. /etc/sysconfig/xcat
 fi
 
-
 MStatus()
 {
   ps ax|grep -v grep|grep xcatd: >& /dev/null
@@ -37,7 +42,7 @@ if [ -f /lib/lsb/init-functions ]; then
   LOG_FAILURE=log_failure_msg
   LOG_WARNING=log_warning_msg
 elif [ -f /etc/init.d/functions ]; then
-  echo RH
+  #echo RH
   . /etc/init.d/functions
   START_DAEMON=daemon
   STATUS=MStatus