diff --git a/app/overrides/spree/admin/shipping_methods/_form/add_require_ship_address.html.haml.deface b/app/overrides/spree/admin/shipping_methods/_form/add_require_ship_address.html.haml.deface
new file mode 100644
index 0000000000..b7bffd4c84
--- /dev/null
+++ b/app/overrides/spree/admin/shipping_methods/_form/add_require_ship_address.html.haml.deface
@@ -0,0 +1,5 @@
+/ insert_bottom "[data-hook='admin_shipping_method_form_availability_fields'] > fieldset"
+
+= f.field_container :shipping_requirements do
+  = f.label :require_ship_address, "Requires shipping address?"
+  = f.check_box :require_ship_address
diff --git a/spec/features/admin/shipping_methods_spec.rb b/spec/features/admin/shipping_methods_spec.rb
index 575e2b7da4..ab7940acc2 100644
--- a/spec/features/admin/shipping_methods_spec.rb
+++ b/spec/features/admin/shipping_methods_spec.rb
@@ -70,6 +70,14 @@ feature 'shipping methods' do
       login_to_admin_as enterprise_user
     end
 
+    it "lets me choose whether a shipping address is required" do
+      click_link "Enterprises"
+      within(".enterprise-#{distributor1.id}") { click_link 'Shipping Methods' }
+      click_link 'New Shipping Method'
+
+      page.should have_content "Requires shipping address?"
+    end
+
     it "creates shipping methods" do
       click_link 'Enterprises'
       within(".enterprise-#{distributor1.id}") { click_link 'Shipping Methods' }