diff --git a/features.drush.inc b/features.drush.inc
index 0d7a10d..a04d640 100644
--- a/features.drush.inc
+++ b/features.drush.inc
@@ -425,7 +425,11 @@ function drush_features_export() {
       _drush_features_export($feature->info, $feature->name, dirname($feature->filename));
     }
     elseif ($feature) {
-      _features_drush_set_error($module, 'FEATURES_FEATURE_NOT_ENABLED');
+      if (drush_confirm(dt('!module is not enabled, do you want to export it anyway?', array('!module' => $module)))) {
+        module_load_include('inc', 'features', 'features.export');
+        _features_populate($items, $feature->info, $feature->name);
+        _drush_features_export($feature->info, $feature->name, dirname($feature->filename));
+      }
     }
     else {
       // Same logic as in _drush_features_export. Should be refactored.
@@ -435,6 +439,27 @@ function drush_features_export() {
       if (!drush_confirm(dt('Do you really want to continue?'))) {
         drush_die('Aborting.');
       }
+
+      // Create stub feature.
+      $defaults = array(
+        'dependencies' => array(),
+        'description' => '',
+        'package' => 'Other',
+        'version' => NULL,
+        'php' => DRUPAL_MINIMUM_PHP,
+        'files' => array(),
+        'bootstrap' => 0,
+      );
+
+      $feature = new stdClass;
+      $feature->name = $module;
+      $feature->filename = $directory . '/' . $module . '.module';
+      $feature->type = 'module';
+      $feature->info = $defaults;
+
+      module_load_include('inc', 'features', 'features.export');
+      _features_populate($items, $feature->info, $feature->name);
+      _drush_features_export($feature->info, $feature->name, dirname($feature->filename));
     }
   }
   else {