diff --git a/manifests/site.pp b/manifests/site.pp
index be97946ec2..4da143e83d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -253,7 +253,7 @@ node "planet.openstack.org" {
   }
 }
 
-node "meetbot.openstack.org" {
+node "eavesdrop.openstack.org" {
   class { 'openstack_server':
     iptables_public_tcp_ports => [80]
   }
@@ -263,7 +263,7 @@ node "meetbot.openstack.org" {
     nick => "openstack",
     network => "FreeNode",
     server => "chat.us.freenode.net:7000",
-    url => "meetbot.openstack.org",
+    url => "eavesdrop.openstack.org",
     channels => "#openstack #openstack-dev #openstack-meeting",
     use_ssl => "True"
   }
diff --git a/modules/meetbot/manifests/site.pp b/modules/meetbot/manifests/site.pp
index 18805412d9..3e520ab72b 100644
--- a/modules/meetbot/manifests/site.pp
+++ b/modules/meetbot/manifests/site.pp
@@ -1,4 +1,5 @@
 define meetbot::site($nick, $network, $server, $url, $channels, $use_ssl) {
+  $nickpass = file("/root/secret-files/${name}-nickserv.pass")
 
   file { "/etc/nginx/sites-available/${name}-meetbot":
     ensure => 'present',
diff --git a/modules/meetbot/templates/supybot.conf.erb b/modules/meetbot/templates/supybot.conf.erb
index fd14328a38..3828d401db 100644
--- a/modules/meetbot/templates/supybot.conf.erb
+++ b/modules/meetbot/templates/supybot.conf.erb
@@ -972,7 +972,7 @@ supybot.plugins.Services.NickServ: NickServ
 # Default value: 
 ###
 supybot.plugins.Services.NickServ.password: 
-supybot.plugins.Services.NickServ.password.<%= nick %>: fsck1T321
+supybot.plugins.Services.NickServ.password.<%= nick %>: <%= nickpass %>
 
 ###
 # Determines what nick the 'ChanServ' service has.