diff --git a/modules/salesforce_webform/salesforce_webform.info.yml b/modules/salesforce_webform/salesforce_webform.info.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a2e9fbe2b30b3bd3b4dec3b1aa5314edabd070b7
--- /dev/null
+++ b/modules/salesforce_webform/salesforce_webform.info.yml
@@ -0,0 +1,9 @@
+name: Salesforce Webform
+type: module
+description: Adds support for webforms fields in Salesforce Mapping.
+package: Salesforce
+core: 8.x
+
+dependencies:
+  - salesforce:salesforce_mapping
+  - webform:webform
diff --git a/modules/salesforce_webform/src/Plugin/SalesforceMappingField/WebformElements.php b/modules/salesforce_webform/src/Plugin/SalesforceMappingField/WebformElements.php
new file mode 100644
index 0000000000000000000000000000000000000000..6778cfdbdbdcd5c30a27c0d42048a008720605db
--- /dev/null
+++ b/modules/salesforce_webform/src/Plugin/SalesforceMappingField/WebformElements.php
@@ -0,0 +1,127 @@
+<?php
+
+namespace Drupal\salesforce_webform\Plugin\SalesforceMappingField;
+
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\salesforce_mapping\Entity\SalesforceMappingInterface;
+use Drupal\salesforce_mapping\SalesforceMappingFieldPluginBase;
+use Drupal\salesforce_mapping\MappingConstants;
+
+/**
+ * Adapter for Webform elements.
+ *
+ * @Plugin(
+ *   id = "WebformElements",
+ *   label = @Translation("Webform elements")
+ * )
+ */
+class WebformElements extends SalesforceMappingFieldPluginBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
+    $pluginForm = parent::buildConfigurationForm($form, $form_state);
+
+    $options = $this->getConfigurationOptions($form['#entity']);
+
+    if (empty($options)) {
+      $pluginForm['drupal_field_value'] += [
+        '#markup' => t('No available webform elements.'),
+      ];
+    }
+    else {
+      $pluginForm['drupal_field_value'] += [
+        '#type' => 'select',
+        '#options' => $options,
+        '#empty_option' => $this->t('- Select -'),
+        '#default_value' => $this->config('drupal_field_value'),
+        '#description' => $this->t('Select a webform element.'),
+      ];
+    }
+    // Just allowed to push.
+    $pluginForm['direction']['#options'] = [
+      MappingConstants::SALESFORCE_MAPPING_DIRECTION_DRUPAL_SF => $pluginForm['direction']['#options'][MappingConstants::SALESFORCE_MAPPING_DIRECTION_DRUPAL_SF],
+    ];
+    $pluginForm['direction']['#default_value'] =
+      MappingConstants::SALESFORCE_MAPPING_DIRECTION_DRUPAL_SF;
+    return $pluginForm;
+
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function value(EntityInterface $entity, SalesforceMappingInterface $mapping) {
+    $element_parts = explode('__', $this->config('drupal_field_value'));
+    $main_element_name = reset($element_parts);
+    $webform = $this->entityTypeManager->getStorage('webform')->load($mapping->get('drupal_bundle'));
+    $webform_element = $webform->getElement($main_element_name);
+    if (!$webform_element) {
+      // This reference field does not exist.
+      return;
+    }
+
+    try {
+      $describe = $this
+        ->salesforceClient
+        ->objectDescribe($mapping->getSalesforceObjectType());
+      $field_definition = $describe->getField($this->config('salesforce_field'));
+      if ($field_definition['type'] == 'multipicklist') {
+        return implode(';', $entity->getElementData($main_element_name));
+      }
+      else {
+        $value = $entity->getElementData($main_element_name);
+        if (isset($element_parts[1])) {
+          $value = $value[$element_parts[1]];
+        }
+        return $value;
+      }
+    }
+    catch (\Exception $e) {
+      return NULL;
+    }
+  }
+
+  /**
+   * Form options helper.
+   */
+  protected function getConfigurationOptions($mapping) {
+    $webform = $this->entityTypeManager->getStorage('webform')->load($mapping->get('drupal_bundle'));
+    $webform_elements = $webform->getElementsDecoded();
+    if (empty($webform_elements)) {
+      return;
+    }
+
+    $options = [];
+
+    // Loop over every field on the webform.
+    foreach ($webform_elements as $element_id => $element) {
+      if ($element['#type'] == 'webform_address') {
+        $element = $webform->getElement($element_id, TRUE);
+        foreach ($element['#webform_composite_elements'] as $sub_element) {
+          $options[$sub_element['#webform_composite_key']] = $element['#title'] . ': ' . (string) $sub_element['#title'];
+        }
+      }
+      else {
+        $options[$element_id] = $element['#title'];
+      }
+    }
+
+    if (empty($options)) {
+      return;
+    }
+
+    asort($options);
+    return $options;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function pull() {
+    return FALSE;
+  }
+
+}