diff --git a/app/views/admin/order_cycles/_exchange_form.html.haml b/app/views/admin/order_cycles/_exchange_form.html.haml
index 47c24bb92a..ab72dcf5c0 100644
--- a/app/views/admin/order_cycles/_exchange_form.html.haml
+++ b/app/views/admin/order_cycles/_exchange_form.html.haml
@@ -13,3 +13,13 @@
     = text_field_tag 'order_cycle_outgoing_exchange_{{ $index }}_pickup_time', '', 'id' => 'order_cycle_outgoing_exchange_{{ $index }}_pickup_time', 'placeholder' => 'Pickup time / date', 'ng-model' => 'exchange.pickup_time'
     %br/
     = text_field_tag 'order_cycle_outgoing_exchange_{{ $index }}_pickup_instructions', '', 'id' => 'order_cycle_outgoing_exchange_{{ $index }}_pickup_instructions', 'placeholder' => 'Delivery instructions', 'ng-model' => 'exchange.pickup_instructions'
+%td.fees
+  %ol
+    %li{'ng-repeat' => 'enterprise_fee in exchange.enterprise_fees'}
+      = select_tag 'order_cycle_{{ exchangeDirection(exchange) }}_exchange_{{ $parent.$index }}_enterprise_fees_{{ $index }}_enterprise_id', nil, {'id' => 'order_cycle_{{ exchangeDirection(exchange) }}_exchange_{{ $parent.$index }}_enterprise_fees_{{ $index }}_enterprise_id', 'ng-model' => 'enterprise_fee.enterprise_id', 'ng-options' => 'enterprise.id as enterprise.name for enterprise in participatingEnterprises()'}
+
+      = select_tag 'order_cycle_{{ exchangeDirection(exchange) }}_exchange_{{ $parent.$index }}_enterprise_fees_{{ $index }}_enterprise_fee_id', nil, {'id' => 'order_cycle_{{ exchangeDirection(exchange) }}_exchange_{{ $parent.$index }}_enterprise_fees_{{ $index }}_enterprise_fee_id', 'ng-model' => 'enterprise_fee.id', 'ng-options' => 'enterprise_fee.id as enterprise_fee.name for enterprise_fee in enterpriseFeesForEnterprise(enterprise_fee.enterprise_id)'}
+
+      = link_to 'Remove', '#', {'id' => 'order_cycle_{{ exchangeDirection(exchange) }}_exchange_{{ $parent.$index }}_enterprise_fees_{{ $index }}_remove', 'ng-click' => 'removeExchangeFee($event, exchange, $index)'}
+
+  = f.submit 'Add fee', 'ng-click' => 'addExchangeFee($event, exchange)'
diff --git a/app/views/admin/order_cycles/_form.html.haml b/app/views/admin/order_cycles/_form.html.haml
index 64190c525b..132d082049 100644
--- a/app/views/admin/order_cycles/_form.html.haml
+++ b/app/views/admin/order_cycles/_form.html.haml
@@ -18,8 +18,9 @@
       %th
       %th Supplier
       %th Products
+      %th Fees
   %tbody{'ng-repeat' => 'exchange in order_cycle.incoming_exchanges'}
-    %tr.supplier
+    %tr{'class' => "supplier supplier-{{ exchange.enterprise_id }}"}
       = render 'exchange_form', :f => f, :type => 'supplier'
     %tr.products{'ng-show' => 'exchange.showProducts'}
       = render 'exchange_supplied_products_form'
@@ -42,8 +43,9 @@
       %th Distributor
       %th Products
       %th Collection details
+      %th Fees
   %tbody{'ng-repeat' => 'exchange in order_cycle.outgoing_exchanges'}
-    %tr.distributor
+    %tr{'class' => "distributor distributor-{{ exchange.enterprise_id }}"}
       = render 'exchange_form', :f => f, :type => 'distributor'
     %tr.products{'ng-show' => 'exchange.showProducts'}
       = render 'exchange_distributed_products_form'
diff --git a/spec/factories.rb b/spec/factories.rb
index 1cdf062e9b..82a8efe333 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -9,10 +9,18 @@ FactoryGirl.define do
       # Suppliers
       ex1 = create(:exchange, :order_cycle => oc, :receiver => oc.coordinator)
       ex2 = create(:exchange, :order_cycle => oc, :receiver => oc.coordinator)
+      ExchangeFee.create!(exchange: ex1,
+                          enterprise_fee: create(:enterprise_fee, enterprise: ex1.sender))
+      ExchangeFee.create!(exchange: ex2,
+                          enterprise_fee: create(:enterprise_fee, enterprise: ex2.sender))
 
       # Distributors
-      create(:exchange, :order_cycle => oc, :sender => oc.coordinator, :pickup_time => 'time 0', :pickup_instructions => 'instructions 0')
-      create(:exchange, :order_cycle => oc, :sender => oc.coordinator, :pickup_time => 'time 1', :pickup_instructions => 'instructions 1')
+      ex3 = create(:exchange, :order_cycle => oc, :sender => oc.coordinator, :pickup_time => 'time 0', :pickup_instructions => 'instructions 0')
+      ex4 = create(:exchange, :order_cycle => oc, :sender => oc.coordinator, :pickup_time => 'time 1', :pickup_instructions => 'instructions 1')
+      ExchangeFee.create!(exchange: ex3,
+                          enterprise_fee: create(:enterprise_fee, enterprise: ex3.receiver))
+      ExchangeFee.create!(exchange: ex4,
+                          enterprise_fee: create(:enterprise_fee, enterprise: ex4.receiver))
 
       # Products with images
       [ex1, ex2].each do |exchange|
diff --git a/spec/features/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb
index d9496086fd..2c6aa1fcbd 100644
--- a/spec/features/admin/order_cycles_spec.rb
+++ b/spec/features/admin/order_cycles_spec.rb
@@ -50,7 +50,9 @@ feature %q{
     distributor = create(:distributor_enterprise, name: 'My distributor')
 
     # And some enterprise fees
+    supplier_fee    = create(:enterprise_fee, enterprise: supplier,    name: 'Supplier fee')
     coordinator_fee = create(:enterprise_fee, enterprise: coordinator, name: 'Coord fee')
+    distributor_fee = create(:enterprise_fee, enterprise: distributor, name: 'Distributor fee')
 
     # When I go to the new order cycle page
     login_to_admin_section
@@ -74,6 +76,11 @@ feature %q{
     check 'order_cycle_incoming_exchange_0_variants_2'
     check 'order_cycle_incoming_exchange_0_variants_3'
 
+    # And I add a supplier fee
+    within("tr.supplier-#{supplier.id}") { click_button 'Add fee' }
+    select 'My supplier',  from: 'order_cycle_incoming_exchange_0_enterprise_fees_0_enterprise_id'
+    select 'Supplier fee', from: 'order_cycle_incoming_exchange_0_enterprise_fees_0_enterprise_fee_id'
+
     # And I add a distributor with the same products
     select 'My distributor', from: 'new_distributor_id'
     click_button 'Add distributor'
@@ -85,6 +92,11 @@ feature %q{
     check 'order_cycle_outgoing_exchange_0_variants_2'
     check 'order_cycle_outgoing_exchange_0_variants_3'
 
+    # And I add a distributor fee
+    within("tr.distributor-#{distributor.id}") { click_button 'Add fee' }
+    select 'My distributor',  from: 'order_cycle_outgoing_exchange_0_enterprise_fees_0_enterprise_id'
+    select 'Distributor fee', from: 'order_cycle_outgoing_exchange_0_enterprise_fees_0_enterprise_fee_id'
+
     # And I click Create
     click_button 'Create'
 
@@ -100,8 +112,10 @@ feature %q{
     page.should have_selector 'td.suppliers', text: 'My supplier'
     page.should have_selector 'td.distributors', text: 'My distributor'
 
-    # And it should have a coordinator fee
-    OrderCycle.last.coordinator_fees.should == [coordinator_fee]
+    # And it should have some fees
+    OrderCycle.last.exchanges.first.enterprise_fees.should == [supplier_fee]
+    OrderCycle.last.coordinator_fees.should                == [coordinator_fee]
+    OrderCycle.last.exchanges.last.enterprise_fees.should  == [distributor_fee]
 
     # And it should have some variants selected
     OrderCycle.last.exchanges.first.variants.count.should == 2
@@ -132,10 +146,11 @@ feature %q{
     page.find('#order_cycle_coordinator_id').value.to_i.should == oc.coordinator_id
     page.should have_selector "select[name='order_cycle_coordinator_fee_0_id']"
 
-    # And I should see the suppliers with products
+    # And I should see the suppliers
     page.should have_selector 'td.supplier_name', :text => oc.suppliers.first.name
     page.should have_selector 'td.supplier_name', :text => oc.suppliers.last.name
 
+    # And the suppliers should have products
     page.all('table.exchanges tbody tr.supplier').each do |row|
       row.find('td.products input').click
 
@@ -145,7 +160,18 @@ feature %q{
       row.find('td.products input').click
     end
 
-    # And I should see the distributors with products
+    # And the suppliers should have fees
+    page.find('#order_cycle_incoming_exchange_0_enterprise_fees_0_enterprise_id option[selected=selected]').
+      text.should == oc.suppliers.first.name
+    page.find('#order_cycle_incoming_exchange_0_enterprise_fees_0_enterprise_fee_id option[selected=selected]').
+      text.should == oc.suppliers.first.enterprise_fees.first.name
+
+    page.find('#order_cycle_incoming_exchange_1_enterprise_fees_0_enterprise_id option[selected=selected]').
+      text.should == oc.suppliers.last.name
+    page.find('#order_cycle_incoming_exchange_1_enterprise_fees_0_enterprise_fee_id option[selected=selected]').
+      text.should == oc.suppliers.last.enterprise_fees.first.name
+
+    # And I should see the distributors
     page.should have_selector 'td.distributor_name', :text => oc.distributors.first.name
     page.should have_selector 'td.distributor_name', :text => oc.distributors.last.name
 
@@ -154,6 +180,7 @@ feature %q{
     page.find('#order_cycle_outgoing_exchange_1_pickup_time').value.should == 'time 1'
     page.find('#order_cycle_outgoing_exchange_1_pickup_instructions').value.should == 'instructions 1'
 
+    # And the distributors should have products
     page.all('table.exchanges tbody tr.distributor').each do |row|
       row.find('td.products input').click
 
@@ -162,6 +189,17 @@ feature %q{
 
       row.find('td.products input').click
     end
+
+    # And the distributors should have fees
+    page.find('#order_cycle_outgoing_exchange_0_enterprise_fees_0_enterprise_id option[selected=selected]').
+      text.should == oc.distributors.first.name
+    page.find('#order_cycle_outgoing_exchange_0_enterprise_fees_0_enterprise_fee_id option[selected=selected]').
+      text.should == oc.distributors.first.enterprise_fees.first.name
+
+    page.find('#order_cycle_outgoing_exchange_1_enterprise_fees_0_enterprise_id option[selected=selected]').
+      text.should == oc.distributors.last.name
+    page.find('#order_cycle_outgoing_exchange_1_enterprise_fees_0_enterprise_fee_id option[selected=selected]').
+      text.should == oc.distributors.last.enterprise_fees.first.name
   end
 
 
@@ -178,8 +216,12 @@ feature %q{
     v2 = create(:variant, product: product)
 
     # And some enterprise fees
+    supplier_fee1 = create(:enterprise_fee, enterprise: supplier, name: 'Supplier fee 1')
+    supplier_fee2 = create(:enterprise_fee, enterprise: supplier, name: 'Supplier fee 2')
     coordinator_fee1 = create(:enterprise_fee, enterprise: coordinator, name: 'Coord fee 1')
     coordinator_fee2 = create(:enterprise_fee, enterprise: coordinator, name: 'Coord fee 2')
+    distributor_fee1 = create(:enterprise_fee, enterprise: distributor, name: 'Distributor fee 1')
+    distributor_fee2 = create(:enterprise_fee, enterprise: distributor, name: 'Distributor fee 2')
 
     # When I go to its edit page
     login_to_admin_section
@@ -210,6 +252,16 @@ feature %q{
     check "order_cycle_incoming_exchange_2_variants_#{v1.id}"
     check "order_cycle_incoming_exchange_2_variants_#{v2.id}"
 
+    # And I configure some supplier fees
+    within("tr.supplier-#{supplier.id}") { click_button 'Add fee' }
+    select 'My supplier', from: 'order_cycle_incoming_exchange_2_enterprise_fees_0_enterprise_id'
+    select 'Supplier fee 1', from: 'order_cycle_incoming_exchange_2_enterprise_fees_0_enterprise_fee_id'
+    within("tr.supplier-#{supplier.id}") { click_button 'Add fee' }
+    within("tr.supplier-#{supplier.id}") { click_button 'Add fee' }
+    click_link 'order_cycle_incoming_exchange_2_enterprise_fees_0_remove'
+    select 'My supplier', from: 'order_cycle_incoming_exchange_2_enterprise_fees_0_enterprise_id'
+    select 'Supplier fee 2', from: 'order_cycle_incoming_exchange_2_enterprise_fees_0_enterprise_fee_id'
+
     # And I add a distributor and some products
     select 'My distributor', from: 'new_distributor_id'
     click_button 'Add distributor'
@@ -224,6 +276,16 @@ feature %q{
     uncheck "order_cycle_outgoing_exchange_2_variants_#{v1.id}"
     check "order_cycle_outgoing_exchange_2_variants_#{v2.id}"
 
+    # And I configure some distributor fees
+    within("tr.distributor-#{distributor.id}") { click_button 'Add fee' }
+    select 'My distributor', from: 'order_cycle_outgoing_exchange_2_enterprise_fees_0_enterprise_id'
+    select 'Distributor fee 1', from: 'order_cycle_outgoing_exchange_2_enterprise_fees_0_enterprise_fee_id'
+    within("tr.distributor-#{distributor.id}") { click_button 'Add fee' }
+    within("tr.distributor-#{distributor.id}") { click_button 'Add fee' }
+    click_link 'order_cycle_outgoing_exchange_2_enterprise_fees_0_remove'
+    select 'My distributor', from: 'order_cycle_outgoing_exchange_2_enterprise_fees_0_enterprise_id'
+    select 'Distributor fee 2', from: 'order_cycle_outgoing_exchange_2_enterprise_fees_0_enterprise_fee_id'
+
     # And I click Update
     click_button 'Update'
 
@@ -242,6 +304,12 @@ feature %q{
     # And my coordinator fees should have been configured
     OrderCycle.last.coordinator_fee_ids.sort.should == [coordinator_fee1.id, coordinator_fee2.id].sort
 
+    # And my supplier fees should have been configured
+    OrderCycle.last.exchanges.incoming.last.enterprise_fee_ids.should == [supplier_fee2.id]
+
+    # And my distributor fees should have been configured
+    OrderCycle.last.exchanges.outgoing.last.enterprise_fee_ids.should == [distributor_fee2.id]
+
     # And it should have some variants selected
     OrderCycle.last.variants.map { |v| v.id }.sort.should == [1, v1.id, v2.id].sort