diff --git a/inventory/barcode/setup/media/software01.png b/inventory/barcode/setup/media/software01.png
new file mode 100644
index 000000000..8b3b563f5
Binary files /dev/null and b/inventory/barcode/setup/media/software01.png differ
diff --git a/inventory/barcode/setup/media/software02.png b/inventory/barcode/setup/media/software02.png
new file mode 100644
index 000000000..614874c7b
Binary files /dev/null and b/inventory/barcode/setup/media/software02.png differ
diff --git a/inventory/barcode/setup/media/software03.png b/inventory/barcode/setup/media/software03.png
new file mode 100644
index 000000000..71b5289e5
Binary files /dev/null and b/inventory/barcode/setup/media/software03.png differ
diff --git a/inventory/barcode/setup/software.rst b/inventory/barcode/setup/software.rst
index 7065ef5b3..354808932 100644
--- a/inventory/barcode/setup/software.rst
+++ b/inventory/barcode/setup/software.rst
@@ -1,3 +1,60 @@
 ====================
 Set up your software
-====================
\ No newline at end of file
+====================
+
+The barcode scanning features can save you a lot of the time usually
+lost switching between the keyboard, the mouse and the scanner. Properly
+attributing barcodes to products, pickings locations, etc. allows you to
+work more efficiently by controlling the software almost exclusively
+with the barcode scanner.
+
+Set products barcodes
+=====================
+
+.. image:: media/software01.png
+    :align: center
+
+In order to fill a picking or to perform an inventory, you need to make
+sure that your products are encoded in Odoo along with their barcodes.
+If this is not already done, you can fill in the products barcodes
+through a handy interface. Go to 
+:menuselection:`Inventory --> Configuration --> Settings`
+and click the **Configure Product Barcodes** button. This
+interface can also be accessed via the planner.
+
+.. note::
+    Product variants: be careful to add barcodes directly on the
+    variant, and not the template product (otherwise you won't be able to
+    differentiate them).
+
+Set locations barcodes
+======================
+
+.. image:: media/software02.png
+    :align: center
+
+If you manage multiple locations, you will find useful to attribute a
+barcode to each location and stick it on the location. You can configure
+the locations barcodes in 
+:menuselection:`Inventory --> Configuration --> Warehouse Management --> Locations`. 
+There is button in the **Print** menu that you
+can use to print the locations names and barcodes. There are 4 barcodes
+per page, arranged in a way that is convenient to print on sticker
+paper.
+
+Example of location naming: **warehouse short name** - **location short
+name** - (**Corridor X** - **Shelf Y** - **Height Z**) Example: A032-025-133
+
+.. image:: media/software03.png
+    :align: center
+
+Barcode formats
+===============
+
+Most retail products use EAN-13 barcodes. They cannot be made up without
+proper authorization: you must pay the International Article Numbering
+Association a fee in exchange for an EAN code sequence (that's why no
+two products in a store will ever have the same EAN code).
+
+Still, as Odoo supports any string as a barcode, so you can always
+define your own barcode format for internal use.