diff --git a/lib/capybara/spec/session.rb b/lib/capybara/spec/session.rb
index b3d6569f..063ab2a4 100644
--- a/lib/capybara/spec/session.rb
+++ b/lib/capybara/spec/session.rb
@@ -68,6 +68,25 @@ shared_examples_for "session" do
   it_should_behave_like "unselect"
   it_should_behave_like "within"
   it_should_behave_like "current_url"
+
+  it "should encode complex field names, like array[][value]" do
+    @session.visit('/form')
+    @session.fill_in('address1_city', :with =>'Paris')
+    @session.fill_in('address1_street', :with =>'CDG')
+    @session.fill_in('address2_city', :with => 'Mikolaiv')
+    @session.fill_in('address2_street', :with => 'PGS')
+    @session.click_button "awesome"
+
+    addresses=extract_results(@session)["addresses"]
+    addresses.should have(2).addresses
+
+    addresses[0]["street"].should == 'CDG'
+    addresses[0]["city"].should   == 'Paris'
+
+    addresses[1]["street"].should == 'PGS'
+    addresses[1]["city"].should   == 'Mikolaiv'
+  end
+
 end
 
 
diff --git a/lib/capybara/spec/views/form.erb b/lib/capybara/spec/views/form.erb
index 875ee9a0..5825ff90 100644
--- a/lib/capybara/spec/views/form.erb
+++ b/lib/capybara/spec/views/form.erb
@@ -158,6 +158,24 @@
       <option selected="selected" value="thermal">Long Johns</option>
     </select>
   </p>
+ 
+  <p>
+    <span>First address<span>
+    <label for='address1_street'>Street</label>
+    <input type="text" name="form[addresses][][street]" value="" id="address1_street">
+  
+    <label for='address1_city'>City</label>
+    <input type="text" name="form[addresses][][city]" value="" id="address1_city"> 
+  </p>  
+
+  <p>  
+    <span>Second address<span>
+    <label for='address2_street'>Street</label>
+    <input type="text" name="form[addresses][][street]" value="" id="address2_street">
+  
+    <label for='address2_city'>City</label>
+    <input type="text" name="form[addresses][][city]" value="" id="address2_city"> 
+  </p>
 
   <div style="display:none;">
     <label for="form_first_name_hidden">