diff --git a/modules/wps/commerce_paypal_wps.module b/modules/wps/commerce_paypal_wps.module
index 1e6146d..7ca66b5 100644
--- a/modules/wps/commerce_paypal_wps.module
+++ b/modules/wps/commerce_paypal_wps.module
@@ -45,6 +45,7 @@ function commerce_paypal_wps_settings_form($settings = NULL) {
     'language' => 'US',
     'server' => 'sandbox',
     'payment_action' => 'sale',
+    'collect_shipping' => 1,
     'ipn_logging' => 'notification',
   );
 
@@ -86,6 +87,16 @@ function commerce_paypal_wps_settings_form($settings = NULL) {
     ),
     '#default_value' => $settings['payment_action'],
   );
+  $form['collect_shipping'] = array(
+    '#type' => 'radios',
+    '#title' => t('PayPal shipping address collection'),
+    '#options' => array(
+      0 => t('Prompt for an address, but do not require one'),
+      1 => t('Do not prompt for an address'),
+      2 => t('Prompt for an address, and require one'),
+    ),
+    '#default_value' => $settings['collect_shipping'],
+  );
   $form['ipn_logging'] = array(
     '#type' => 'radios',
     '#title' => t('IPN logging'),
@@ -289,7 +300,7 @@ function commerce_paypal_wps_order_form($form, &$form_state, $order, $settings)
     'no_note' => 1,
 
     // Do not display a shipping address prompt at PayPal
-    'no_shipping' => 1,
+    'no_shipping' => $settings['collect_shipping'],
 
     // Return to the review page when payment is canceled
     'cancel_return' => $settings['cancel_return'],