diff --git a/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg b/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg
index 4ca3f146ad..6e86cdfe59 100644
--- a/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg
+++ b/roles/nagios_server/files/nagios/hostgroups/kvmHosts.cfg
@@ -5,5 +5,5 @@
 define hostgroup {
         hostgroup_name  kvmServers
         alias           kvmServers
-        members         bvirthost06, bvirthost07, bvirthost08, bvirthost09, bvirthost10, bvirthost11, virthost01, virthost02, virthost11, virthost03, virthost05, virthost06, virthost07, virthost09, virthost12, virthost14, virthost15, virthost16, virthost17, virthost18, virthost-comm02, virthost-comm03, virthost-comm04, tummy01, bodhost01, osuosl01, osuosl02, osuosl03, ibiblio02, ibiblio03, ibiblio04, coloamer01, internetx01, qa09.qa, qa10.qa, qa11.qa, qa12.qa, qa13.qa, qa14.qa, host1plus01, dedicatedsolutions01
+        members         bvirthost06, bvirthost07, bvirthost08, bvirthost09, bvirthost10, bvirthost11, virthost01, virthost02, virthost11, virthost03, virthost05, virthost06, virthost07, virthost09, virthost12, virthost14, virthost15, virthost16, virthost17, virthost18, virthost-comm02, virthost-comm03, virthost-comm04, tummy01, bodhost01, osuosl01, osuosl02, osuosl03, ibiblio02, ibiblio03, ibiblio04, ibiblio05, coloamer01, internetx01, qa09.qa, qa10.qa, qa11.qa, qa12.qa, qa13.qa, qa14.qa, host1plus01, dedicatedsolutions01
 }
diff --git a/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg b/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg
index 4fb8098df8..89a80ce229 100644
--- a/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg
+++ b/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg
@@ -5,5 +5,5 @@
 define hostgroup {
         hostgroup_name  vpnclients
         alias           vpnclients
-        members         tummy01,unbound-tummy01,smtp-mm-tummy01,proxy03,unbound-osuosl01,bodhost01,proxy07,coloamer01,proxy08,proxy09,download-ib02,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent01,ibiblio03,ibiblio04,people01,internetx01,hosted-lists01,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,hosted03,ibiblio02,collab03,smtp-mm-osuosl01,host1plus01,dedicatedsolutions01,proxy05,proxy11,proxy12
+        members         tummy01,unbound-tummy01,smtp-mm-tummy01,proxy03,unbound-osuosl01,bodhost01,proxy07,coloamer01,proxy08,osuosl02,proxy09,download-ib02,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent01,ibiblio03,ibiblio04,people01,internetx01,hosted-lists01,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,hosted03,ibiblio02,collab03,smtp-mm-osuosl01,host1plus01,dedicatedsolutions01,proxy05,dedicatedsolutions01,proxy11,ibiblio05,proxy12
 }
diff --git a/roles/nagios_server/files/nagios/hosts/ibiblio05.cfg b/roles/nagios_server/files/nagios/hosts/ibiblio05.cfg
new file mode 100644
index 0000000000..bdfd48f2f9
--- /dev/null
+++ b/roles/nagios_server/files/nagios/hosts/ibiblio05.cfg
@@ -0,0 +1,7 @@
+define host {
+  host_name                    ibiblio05
+  alias                        ibiblio05.fedoraproject.org
+  use                          defaulttemplate
+  address                      ibiblio05.fedoraproject.org
+  parents                      ibiblio-gw
+}
diff --git a/roles/nagios_server/files/nagios/servicegroups/fp-wiki.cfg b/roles/nagios_server/files/nagios/servicegroups/fp-wiki.cfg
index 9a00ee598e..a1ce0e119f 100644
--- a/roles/nagios_server/files/nagios/servicegroups/fp-wiki.cfg
+++ b/roles/nagios_server/files/nagios/servicegroups/fp-wiki.cfg
@@ -1,6 +1,6 @@
 define servicegroup {
     servicegroup_name   fp-wiki
     alias               Fedora Project Wiki
-    members             proxy01,fedoraproject.org - wiki - non-cached,proxy02,fedoraproject.org - wiki - non-cached,proxy03,fedoraproject.org - wiki - non-cached,proxy04,fedoraproject.org - wiki - non-cached,proxy06,fedoraproject.org - wiki - non-cached,proxy07,fedoraproject.org - wiki - non-cached,proxy08,fedoraproject.org - wiki - non-cachedproxy09,fedoraproject.org - wiki - non-cached,proxy01,fedoraproject.org - wiki,proxy02,fedoraproject.org - wiki,proxy03,fedoraproject.org - wiki,proxy04,fedoraproject.org - wiki,proxy06,fedoraproject.org - wiki,proxy07,fedoraproject.org - wiki,proxy08,proxy09,fedoraproject.org - wiki,proxy05,fedoraproject.org - wiki,proxy10,fedoraproject.org - wiki,proxy11,fedoraproject.org - wiki,proxy12,fedoraproject.org - wiki
+    members             proxy01,fedoraproject.org - wiki - non-cached,proxy02,fedoraproject.org - wiki - non-cached,proxy03,fedoraproject.org - wiki - non-cached,proxy04,fedoraproject.org - wiki - non-cached,proxy06,fedoraproject.org - wiki - non-cached,proxy07,fedoraproject.org - wiki - non-cached,proxy08,fedoraproject.org - wiki - non-cached,proxy09,fedoraproject.org - wiki - non-cached,proxy01,fedoraproject.org - wiki,proxy02,fedoraproject.org - wiki,proxy03,fedoraproject.org - wiki,proxy04,fedoraproject.org - wiki,proxy06,fedoraproject.org - wiki,proxy07,fedoraproject.org - wiki,proxy08,fedoraproject.org - wiki,proxy09,fedoraproject.org - wiki,proxy05,fedoraproject.org - wiki,proxy10,fedoraproject.org - wiki,proxy11,fedoraproject.org - wiki,proxy12,fedoraproject.org - wiki
 }
 
diff --git a/roles/nagios_server/files/nagios/servicegroups/pkgdb.cfg b/roles/nagios_server/files/nagios/servicegroups/pkgdb.cfg
index 8683e19808..566078c695 100644
--- a/roles/nagios_server/files/nagios/servicegroups/pkgdb.cfg
+++ b/roles/nagios_server/files/nagios/servicegroups/pkgdb.cfg
@@ -1,6 +1,6 @@
 define servicegroup {
     servicegroup_name   pkgdb
     alias               Package Database
-    members             proxy01,pkgdb-external,proxy02,pkgdb-external,proxy03,pkgdb-external,proxy04,pkgdb-external,proxy08,pkgdb-external,proxy09,pkgdb-external,pkgdb01,pkgdb-internal,pkgdb02,pkgdb-internal,pkgdb01.stg,pkgdb-internal,db01,proxy11,pkgdb-external,proxy12,pkgdb-external
+    members             proxy01,pkgdb-external,proxy02,pkgdb-external,proxy03,pkgdb-external,proxy04,pkgdb-external,proxy08,pkgdb-external,proxy09,pkgdb-external,pkgdb01,pkgdb-internal,pkgdb02,pkgdb-internal,pkgdb01.stg,pkgdb-internal,proxy11,pkgdb-external,proxy12,pkgdb-external
 }