diff --git a/features/drupalorg_marketplace/drupalorg_marketplace.features.field_base.inc b/features/drupalorg_marketplace/drupalorg_marketplace.features.field_base.inc
index 6b1e795..d860649 100644
--- a/features/drupalorg_marketplace/drupalorg_marketplace.features.field_base.inc
+++ b/features/drupalorg_marketplace/drupalorg_marketplace.features.field_base.inc
@@ -77,6 +77,31 @@ function drupalorg_marketplace_field_default_field_bases() {
     'type_name' => 'organization',
   );
 
+  // Exported field_base: 'field_contrib_org_request'
+  $field_bases['field_contrib_org_request'] = array(
+    'active' => 1,
+    'cardinality' => 1,
+    'deleted' => 0,
+    'entity_types' => array(),
+    'field_name' => 'field_contrib_org_request',
+    'indexes' => array(
+      'value' => array(
+        0 => 'value',
+      ),
+    ),
+    'locked' => 0,
+    'module' => 'list',
+    'settings' => array(
+      'allowed_values' => array(
+        0 => 'No request',
+        1 => 'Request listing in the Drupal organizational contributor',
+      ),
+      'allowed_values_function' => '',
+    ),
+    'translatable' => 0,
+    'type' => 'list_boolean',
+  );
+
   // Exported field_base: 'field_contributions'
   $field_bases['field_contributions'] = array(
     'active' => 1,
diff --git a/features/drupalorg_marketplace/drupalorg_marketplace.features.field_instance.inc b/features/drupalorg_marketplace/drupalorg_marketplace.features.field_instance.inc
index 0334545..4190bc3 100644
--- a/features/drupalorg_marketplace/drupalorg_marketplace.features.field_instance.inc
+++ b/features/drupalorg_marketplace/drupalorg_marketplace.features.field_instance.inc
@@ -93,7 +93,7 @@ function drupalorg_marketplace_field_default_field_instances() {
         'summary_rows' => 5,
       ),
       'type' => 'text_textarea_with_summary',
-      'weight' => 9,
+      'weight' => 6,
     ),
   );
 
@@ -188,23 +188,72 @@ function drupalorg_marketplace_field_default_field_instances() {
         'size' => 20,
       ),
       'type' => 'text_textfield',
-      'weight' => 7,
+      'weight' => 10,
     ),
     'widget_type' => 'text_textfield',
   );
 
-  // Exported field_instance: 'node-organization-field_contributions'
-  $field_instances['node-organization-field_contributions'] = array(
+  // Exported field_instance: 'node-organization-field_contrib_org_request'
+  $field_instances['node-organization-field_contrib_org_request'] = array(
     'bundle' => 'organization',
     'default_value' => array(
       0 => array(
-        'value' => '',
-        'format' => 1,
-        '_error_element' => 'default_value_widget][field_contributions][0][value',
+        'value' => 0,
       ),
     ),
     'deleted' => 0,
-    'description' => '<p>Self promote! These fields determine eligibility for the Drupal.org marketplace and show the Drupal community how much you\'ve given back. Moderators use this information to respond to issues about community involvement, so it is important to list anything and everything relevant:</p>
+    'description' => 'If you request a listing, please review <a href="/org/guidelines">guidelines for Organizations who do not sell Drupal services</a>. You cannot be listed here and the marketplace.  Volunteer moderators will review your request. If you are not listed, you will still have the page and some features, like your logo replacing company name on profile pages. ',
+    'display' => array(
+      'default' => array(
+        'label' => 'above',
+        'module' => 'list',
+        'settings' => array(),
+        'type' => 'list_default',
+        'weight' => 20,
+      ),
+      'issuemetadata' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'nodechanges' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'teaser' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+    ),
+    'entity_type' => 'node',
+    'field_name' => 'field_contrib_org_request',
+    'label' => 'List in Contributing Organizations',
+    'required' => 0,
+    'settings' => array(
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'options',
+      'settings' => array(
+        'display_label' => 0,
+      ),
+      'type' => 'options_onoff',
+      'weight' => 35,
+    ),
+  );
+
+  // Exported field_instance: 'node-organization-field_contributions'
+  $field_instances['node-organization-field_contributions'] = array(
+    'bundle' => 'organization',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => '<p>Self promote! These fields determine eligibility for the Drupal.org marketplace and organizational contributors sections of the site.  They show the Drupal community how much you\'ve given back. Moderators use this information to respond to issues about community involvement, so it is important to list anything and everything relevant:</p>
 
 <ul>
 <li>Contributions to core: Highlight your team. What have you done to make Drupal\'s core amazing?</li>
@@ -300,7 +349,7 @@ function drupalorg_marketplace_field_default_field_instances() {
         'size' => 60,
       ),
       'type' => 'text_textarea',
-      'weight' => 10,
+      'weight' => 7,
     ),
     'widget_type' => 'text_textarea',
   );
@@ -1736,7 +1785,7 @@ function drupalorg_marketplace_field_default_field_instances() {
       'module' => 'options',
       'settings' => array(),
       'type' => 'options_select',
-      'weight' => 5,
+      'weight' => 9,
     ),
   );
 
@@ -1784,7 +1833,7 @@ function drupalorg_marketplace_field_default_field_instances() {
       'module' => 'options',
       'settings' => array(),
       'type' => 'options_select',
-      'weight' => 6,
+      'weight' => 5,
     ),
   );
 
@@ -1839,7 +1888,7 @@ function drupalorg_marketplace_field_default_field_instances() {
 
   // Translatables
   // Included for use with string extractors like potx.
-  t('<p>Self promote! These fields determine eligibility for the Drupal.org marketplace and show the Drupal community how much you\'ve given back. Moderators use this information to respond to issues about community involvement, so it is important to list anything and everything relevant:</p>
+  t('<p>Self promote! These fields determine eligibility for the Drupal.org marketplace and organizational contributors sections of the site.  They show the Drupal community how much you\'ve given back. Moderators use this information to respond to issues about community involvement, so it is important to list anything and everything relevant:</p>
 
 <ul>
 <li>Contributions to core: Highlight your team. What have you done to make Drupal\'s core amazing?</li>
@@ -1865,6 +1914,8 @@ function drupalorg_marketplace_field_default_field_instances() {
   t('Helps potential clients know what they are getting into.');
   t('Hosting type');
   t('If you request a listing, please review <a href="/marketplace/guidelines">Marketplace guidelines</a>. Volunteer moderators will review your request. If you are not listed, you will still have the page and some features, like your logo replacing company name on profile pages.');
+  t('If you request a listing, please review <a href="/org/guidelines">guidelines for Organizations who do not sell Drupal services</a>. You cannot be listed here and the marketplace.  Volunteer moderators will review your request. If you are not listed, you will still have the page and some features, like your logo replacing company name on profile pages. ');
+  t('List in Contributing Organizations');
   t('List in Training section');
   t('List in marketplace');
   t('List related sector(s)');
diff --git a/features/drupalorg_marketplace/drupalorg_marketplace.features.inc b/features/drupalorg_marketplace/drupalorg_marketplace.features.inc
index 15130ef..5eb57ab 100644
--- a/features/drupalorg_marketplace/drupalorg_marketplace.features.inc
+++ b/features/drupalorg_marketplace/drupalorg_marketplace.features.inc
@@ -31,11 +31,10 @@ function drupalorg_marketplace_node_info() {
     'organization' => array(
       'name' => t('Organization'),
       'base' => 'node_content',
-      'description' => t('Listings for the marketplace section of the site.'),
+      'description' => t('Users who associate themselves with an organization appear on the organizations page.  This information is also used in the marketplace and organizational contributor sections of the site.'),
       'has_title' => '1',
       'title_label' => t('Organization name'),
-      'help' => t('Review <a href="/marketplace/guidelines">Marketplace guidelines</a> first.
-<br />People with your organization name in the user profile field "current company or organization" will be shown on your organization page.'),
+      'help' => t('People with your organization name in the user profile field "current company or organization" will be shown on your organization page.'),
     ),
   );
   drupal_alter('node_info', $items);
diff --git a/features/drupalorg_marketplace/drupalorg_marketplace.field_group.inc b/features/drupalorg_marketplace/drupalorg_marketplace.field_group.inc
index 2f36f75..2d9da75 100644
--- a/features/drupalorg_marketplace/drupalorg_marketplace.field_group.inc
+++ b/features/drupalorg_marketplace/drupalorg_marketplace.field_group.inc
@@ -44,7 +44,7 @@ function drupalorg_marketplace_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'Hosting',
-    'weight' => '12',
+    'weight' => '10',
     'children' => array(
       0 => 'field_organization_security',
       1 => 'field_hosting_type',
@@ -119,7 +119,7 @@ function drupalorg_marketplace_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'Moderation',
-    'weight' => '13',
+    'weight' => '12',
     'children' => array(
       0 => 'field_org_training_issue',
       1 => 'field_organization_issue',
@@ -169,6 +169,62 @@ function drupalorg_marketplace_field_group_info() {
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
+  $field_group->identifier = 'group_other_organizations|node|organization|form';
+  $field_group->group_name = 'group_other_organizations';
+  $field_group->entity_type = 'node';
+  $field_group->bundle = 'organization';
+  $field_group->mode = 'form';
+  $field_group->parent_name = '';
+  $field_group->data = array(
+    'label' => 'Other Organizations',
+    'weight' => '11',
+    'children' => array(
+      0 => 'field_contrib_org_request',
+    ),
+    'format_type' => 'fieldset',
+    'format_settings' => array(
+      'formatter' => 'collapsible',
+      'instance_settings' => array(
+        'description' => '',
+        'classes' => 'group-other-organizations field-group-fieldset',
+        'required_fields' => 1,
+      ),
+    ),
+  );
+  $export['group_other_organizations|node|organization|form'] = $field_group;
+
+  $field_group = new stdClass();
+  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
+  $field_group->api_version = 1;
+  $field_group->identifier = 'group_services|node|organization|form';
+  $field_group->group_name = 'group_services';
+  $field_group->entity_type = 'node';
+  $field_group->bundle = 'organization';
+  $field_group->mode = 'form';
+  $field_group->parent_name = '';
+  $field_group->data = array(
+    'label' => 'Services',
+    'weight' => '8',
+    'children' => array(
+      0 => 'field_budget',
+      1 => 'field_org_marketplace_request',
+      2 => 'taxonomy_vocabulary_48',
+    ),
+    'format_type' => 'fieldset',
+    'format_settings' => array(
+      'formatter' => 'collapsible',
+      'instance_settings' => array(
+        'description' => '',
+        'classes' => 'group-services field-group-fieldset',
+        'required_fields' => 1,
+      ),
+    ),
+  );
+  $export['group_services|node|organization|form'] = $field_group;
+
+  $field_group = new stdClass();
+  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
+  $field_group->api_version = 1;
   $field_group->identifier = 'group_training|node|organization|default';
   $field_group->group_name = 'group_training';
   $field_group->entity_type = 'node';
@@ -203,7 +259,7 @@ function drupalorg_marketplace_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'Training',
-    'weight' => '11',
+    'weight' => '9',
     'children' => array(
       0 => 'field_org_training_request',
       1 => 'field_organization_training_desc',