diff --git a/Provision/Config/Drushrc/Aegir.php b/Provision/Config/Drushrc/Aegir.php
index e7ccf41..6dd028c 100644
--- a/Provision/Config/Drushrc/Aegir.php
+++ b/Provision/Config/Drushrc/Aegir.php
@@ -27,10 +27,17 @@ class Provision_Config_Drushrc_Aegir extends Provision_Config_Drushrc {
     $this->data['hosting_features'] = $enabled_features;
 
     $this->data['drush_exclude'] = array();
+    $this->data['drush_include'] = array();
     foreach($enabled_features as $feature => $status) {
       if ($status === '0') {
         $this->data['drush_exclude'][] = $feature;
       }
+      else {
+        $feature_include_path = DRUPAL_ROOT . '/' . drupal_get_path('module', $features[$feature]['module']) . '/drush';
+        if (file_exists($feature_include_path)) {
+          $this->data['drush_include'][$feature] = $feature_include_path;
+        }
+      }
     }
   }
 
diff --git a/Provision/Config/Drushrc/provision_drushrc_aegir.tpl.php b/Provision/Config/Drushrc/provision_drushrc_aegir.tpl.php
index 0b75b54..eefb6b7 100644
--- a/Provision/Config/Drushrc/provision_drushrc_aegir.tpl.php
+++ b/Provision/Config/Drushrc/provision_drushrc_aegir.tpl.php
@@ -3,8 +3,15 @@
  * @file
  * Template file for an Aegir-wide drushrc file.
  */
-print "<?php \n\n\$options['hosting_features'] = ". var_export($hosting_features, TRUE) . ";\n";
+print "<?php \n\n";
 
-print "\$options['exclude'] = ". var_export($drush_exclude, TRUE) . ";\n";
+print "# A list of Aegir features and their enabled status.\n";
+print "\$options['hosting_features'] = ". var_export($hosting_features, TRUE) . ";\n\n";
 
-?>
+print "# A list of modules to be excluded because the hosting feature is not enabled.\n";
+print "\$options['exclude'] = ". var_export($drush_exclude, TRUE) . ";\n\n";
+
+print "# A list of paths that drush should include even when working outside\n";
+print "# the context of the hostmaster site.\n";
+print "\$options['include'] = ". var_export($drush_include, TRUE) . ";\n";
+?>
\ No newline at end of file