diff --git a/prod_check.module b/prod_check.module
index 39242c0..215470e 100755
--- a/prod_check.module
+++ b/prod_check.module
@@ -1054,7 +1054,8 @@ function _prod_check_boost($caller = 'internal') {
   if (module_exists('boost')) {
     $check = array();
 
-    $path = 'admin/config/development/performance/boost';
+    $path = 'admin/config/system/boost';
+    $path_crawler = 'admin/config/system/boost/crawler';
     if ($caller != 'internal') {
       $path = PRODCHECK_BASEURL . $path;
     }
@@ -1091,25 +1092,54 @@ function _prod_check_boost($caller = 'internal') {
       '#nagios_type' => 'state',
     );
 
-    /*
+
     // Crawl on cron check
 
     // The Boost module is in development atm, as soon as it is released we'll fix this.
 
-        $subtitle = 'Crawl on cron';
-        $var = variable_get('boost_crawl_on_cron', FALSE);
-        $check['prod_check_boost_crawl_on_cron'] = array(
-          '#title' => t($title.$subtitle),
-          '#state' => $var,
-          '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : PROD_CHECK_REQUIREMENT_WARNING,
-          '#value_ok'  => t('Enabled'),
-          '#value_nok'  => t('Disabled'),
-          '#description_ok'  => prod_check_ok_title($subtitle, $path),
-          '#description_nok' => t('!link is disabled! You should enable this to ensure that the users are served cached pages all the time. The crawler caches pages before anyone can access them.', prod_check_link_array($subtitle, $path)),
-          '#nagios_key' => 'BCRCR',
-          '#nagios_type' => 'state',
-        );
-     */
+    $subtitle = 'Crawl on cron';
+    $var = module_exists('boost_crawler') && variable_get('boost_crawl_on_cron', FALSE);
+    $check['prod_check_boost_crawl_on_cron'] = array(
+      '#title' => t($title.$subtitle),
+      '#state' => $var,
+      '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : PROD_CHECK_REQUIREMENT_WARNING,
+      '#value_ok'  => t('Enabled'),
+      '#value_nok'  => t('Disabled'),
+      '#description_ok'  => prod_check_ok_title($subtitle, $path),
+      '#description_nok' => t('!link is disabled! You should enable this to ensure that the users are served cached pages all the time. The crawler caches pages before anyone can access them.', prod_check_link_array($subtitle, $path_crawler)),
+      '#nagios_key' => 'BCRCR',
+      '#nagios_type' => 'state',
+    );
+
+
+    // Boost nagios page check
+    $subtitle = 'Nagios page';
+
+    $visibility = variable_get('boost_cacheability_option', BOOST_VISIBILITY_NOTLISTED);
+    $pages_setting = variable_get('boost_cacheability_pages', BOOST_CACHEABILITY_PAGES);
+
+    $pages_array = explode("\n", str_replace(array("\n", "\r\n"), "\n", strtolower($pages_setting)));
+
+    $var = ($visibility && in_array("nagios", $pages_array)) || (!$visibility && !in_array("nagios", $pages_array));
+    if($visibility) {
+      $advise = 'You should remove \'nagios\' from the listed pages.';
+    }
+    else {
+      $advise = 'You should add \'nagios\' to the listed pages.';
+    }
+
+    $check['prod_check_boost_apache_nagios_page'] = array(
+      '#title' => t($title.$subtitle),
+      '#state' => !$var,
+      '#severity' => ($caller == 'nagios') ? NAGIOS_STATUS_WARNING : PROD_CHECK_REQUIREMENT_WARNING,
+      '#value_ok'  => t('Enabled'),
+      '#value_nok'  => t('Not properly configured.'),
+      '#description_ok'  => prod_check_ok_title($subtitle, $path),
+      '#description_nok' => t('The !link is set to be cached by Boost.'.$advise, prod_check_link_array($subtitle, $path)),
+      '#nagios_key' => 'BNAPA',
+      '#nagios_type' => 'state',
+    );
+
 
     // Apache etag check
     $subtitle = 'ETag';
@@ -1131,6 +1161,7 @@ function _prod_check_boost($caller = 'internal') {
       '#nagios_key' => 'BETAG',
       '#nagios_type' => 'state',
     );
+
     $result = prod_check_execute_check($check, $caller);
   }
   return $result;