diff --git a/CHANGELOG b/CHANGELOG
index d6f6ec252d..f65cce04a4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+* Add relate from party to drop shipments
+
 Version 5.8.0 - 2020-11-02
 * Bug fixes (see mercurial logs for details)
 * Remove support for Python 3.5
diff --git a/icons/tryton-shipment-drop.svg b/icons/tryton-shipment-drop.svg
new file mode 100644
index 0000000000..411d75701b
--- /dev/null
+++ b/icons/tryton-shipment-drop.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24" viewBox="0 0 24 24" width="24"><g><rect fill="none" height="24" width="24"/><path d="M17,4l4,4l-4,4V9h-4V7h4V4z M10,7C9.45,7,9,7.45,9,8s0.45,1,1,1s1-0.45,1-1S10.55,7,10,7z M6,7C5.45,7,5,7.45,5,8 s0.45,1,1,1s1-0.45,1-1S6.55,7,6,7z M7,17h4v-2H7v-3l-4,4l4,4V17z M14,17c0.55,0,1-0.45,1-1c0-0.55-0.45-1-1-1s-1,0.45-1,1 C13,16.55,13.45,17,14,17z M18,17c0.55,0,1-0.45,1-1c0-0.55-0.45-1-1-1s-1,0.45-1,1C17,16.55,17.45,17,18,17z"/></g></svg>
\ No newline at end of file
diff --git a/party.xml b/party.xml
new file mode 100644
index 0000000000..e5c6732c93
--- /dev/null
+++ b/party.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tryton>
+    <data>
+        <record model="ir.ui.view" id="party_view_form">
+            <field name="model">party.party</field>
+            <field name="inherit" ref="party.party_view_form"/>
+            <field name="name">party_form</field>
+        </record>
+    </data>
+</tryton>
diff --git a/setup.py b/setup.py
index 2a962fca41..b87fd2417e 100755
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,8 @@ setup(name=name,
         ),
     package_data={
         'trytond.modules.sale_supply_drop_shipment': (info.get('xml', [])
-            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'tests/*.rst']),
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po', 'icons/*.svg',
+                'tests/*.rst']),
         },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
diff --git a/stock.xml b/stock.xml
index 9f3cefeddd..2a5a6151f1 100644
--- a/stock.xml
+++ b/stock.xml
@@ -3,6 +3,10 @@
 this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
+        <record model="ir.ui.icon" id="stock_shipment_drop">
+            <field name="name">tryton-shipment-drop</field>
+            <field name="path">icons/tryton-shipment-drop.svg</field>
+        </record>
 
         <record model="ir.ui.view" id="stock_configuration_view_form">
             <field name="model">stock.configuration</field>
@@ -204,6 +208,24 @@ this repository contains the full copyright notices and license terms. -->
             <field name="rule_group" ref="rule_group_shipment_drop"/>
         </record>
 
+        <record model="ir.action.act_window" id="act_shipment_drop_relate_party">
+            <field name="name">Drop Shipments</field>
+            <field name="res_model">stock.shipment.drop</field>
+            <field name="domain"
+                eval="['OR', ('customer', 'in', Eval('active_ids')), ('supplier', 'in', Eval('active_ids'))]"
+                pyson="1"/>
+            <field name="search_value" eval="[('state', 'not in', ['done', 'cancelled'])]" pyson="1"/>
+        </record>
+        <record model="ir.action.keyword" id="act_shipment_drop_relate_party_keyword1">
+            <field name="keyword">form_relate</field>
+            <field name="model">party.party,-1</field>
+            <field name="action" ref="act_shipment_drop_relate_party"/>
+        </record>
+        <record model="ir.action-res.group" id="act_shipment_drop_relate_party-group_stock">
+            <field name="action" ref="act_shipment_drop_relate_party"/>
+            <field name="group" ref="stock.group_stock"/>
+        </record>
+
         <record model="ir.action.act_window" id="act_sale_shipments_relate">
             <field name="name">Sales</field>
             <field name="res_model">sale.sale</field>
diff --git a/tryton.cfg b/tryton.cfg
index 1528d04032..b5cad65728 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -13,4 +13,5 @@ xml:
     stock.xml
     sale.xml
     purchase.xml
+    party.xml
     message.xml
diff --git a/view/party_form.xml b/view/party_form.xml
new file mode 100644
index 0000000000..1ff52a4f03
--- /dev/null
+++ b/view/party_form.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath expr="//group[@id='links']" position="inside">
+        <link icon="tryton-shipment-drop" name="sale_supply_drop_shipment.act_shipment_drop_relate_party" empty="hide"/>
+    </xpath>
+</data>