diff --git a/ci/ci_setup_notes.txt b/ci/ci_setup_notes.txt
index 780277c939775..7581a2467256d 100644
--- a/ci/ci_setup_notes.txt
+++ b/ci/ci_setup_notes.txt
@@ -17,9 +17,9 @@ root:*:14001:0:99999:7:::
 
 * Change Hostname:
 $ sudo vi /etc/hostname
-change to 'ci'
+change to correct hostname
 $ sudo vi /etc/hosts
-replace old hostname with 'ci'
+replace old hostname with the correct hostname
 # reboot to use new hostname (and test reboot)
 $ sudo shutdown -r now
 
diff --git a/ci/cruise_config.rb b/ci/cruise_config.rb
index 2247a1b6ea065..439a93d69b07d 100644
--- a/ci/cruise_config.rb
+++ b/ci/cruise_config.rb
@@ -1,6 +1,9 @@
 Project.configure do |project|
- project.build_command = 'sudo update_rubygems && ruby ci/ci_build.rb'
- project.email_notifier.emails = ['thewoolleyman@gmail.com']
-# project.email_notifier.emails = ['thewoolleyman@gmail.com','michael@koziarski.com', 'david@loudthinking.com', 'jeremy@bitsweat.net', 'josh@joshpeek.com', 'pratiknaik@gmail.com', 'wycats@gmail.com']
- project.email_notifier.from = 'thewoolleyman+railsci@gmail.com'
+  # Send email notifications about broken and fixed builds to core mailing list
+  if Socket.gethostname =~ /ci.rubyonrails.org/
+    project.email_notifier.emails = ['rubyonrails-core@googlegroups.com']
+  end
+
+  project.build_command = 'sudo update_rubygems && ruby ci/ci_build.rb'
+  project.email_notifier.from = 'thewoolleyman+railsci@gmail.com'
 end