diff --git a/doc/setup.rst b/doc/setup.rst
index 6a901cc8ff8..f200108964e 100644
--- a/doc/setup.rst
+++ b/doc/setup.rst
@@ -10,3 +10,4 @@ Setting Up
     setup/install
     setup/deploy
     setup/cdn
+    setup/enterprise
diff --git a/doc/setup/enterprise.rst b/doc/setup/enterprise.rst
new file mode 100644
index 00000000000..b44dff361d4
--- /dev/null
+++ b/doc/setup/enterprise.rst
@@ -0,0 +1,110 @@
+============================
+From Community to Enterprise
+============================
+
+Depending on your current installation, there are multiple ways to upgrade
+your community version.
+In any case the basic guidelines are:
+
+* Backup your community database
+
+  .. image:: enterprise/db_manager.png
+    :class: img-responsive
+
+* Shutdown your server
+
+* Upgrade the web module
+
+* Restart your server
+
+* Enter your Odoo Enterprise Subscription code
+
+.. image:: enterprise/enterprise_code.png
+  :class: img-responsive
+
+On Linux, using an installer
+============================
+
+* Backup your community database
+
+* Stop the odoo service
+
+  .. code-block:: console
+
+    $ sudo service odoo stop
+
+* Install the enterprise .deb (it should install over the community package)
+
+  .. code-block:: console
+
+    $ sudo dpkg -i <path_to_enterprise_deb>
+  
+* Update your database to the enterprise packages using
+
+  .. code-block:: console
+
+    $ python /usr/bin/odoo.py -d <database_name> -u web --stop-after-init
+
+* You should be able to connect to your Odoo Enterprise instance using your usual mean of identification.
+  You can then link your database with your Odoo Enterprise Subscription by entering the code you received
+  by e-mail in the form input
+
+
+On Linux, using the source code
+===============================
+
+There are many ways to launch your server when using sources, and you probably
+have your own favourite. You may need to adapt sections to your usual workflow.
+
+* Shutdown your server
+* Backup your community database
+* Update the ``--addons-path`` parameter of your launch command (``init.d``, custom script,
+  configuration file, etc.). The Enterprise addons folder should be included" **before** the community modules.
+  For example:
+
+  .. code-block:: console
+
+    $ --addons-path=~/src/custom_modules,~/src/enterprise,~/src/odoo/addons
+
+* Update the web module by using
+
+  .. code-block:: console
+
+    $ -d <database_name> -u web --stop-after-init
+
+  Depending on the size of your database, this may take some time.
+
+* Restart your server with the updated addons path of point 3.
+  You should be able to connect to your instance. You can then link your database with your
+  Odoo Enterprise Subscription by entering the code you received by e-mail in the form input
+
+On Windows
+==========
+
+* Backup your community database
+
+* Uninstall Odoo Community (using the Uninstall executable in the installation folder) -
+  PostgreSQL will remain installed
+
+  .. image:: enterprise/windows_uninstall.png
+    :class: img-responsive
+
+* Launch the Odoo Enterprise Installer and follow the steps normally. When choosing
+  the installation path, you can set the folder of the Community installation
+  (this folder still contains the PostgreSQL installation).
+  Uncheck ``Start Odoo`` at the end of the installation
+
+  .. image:: enterprise/windows_setup.png
+   :class: img-responsive
+
+* Using a command window, update your Odoo Database using this command (from the Odoo
+  installation path, in the server subfolder)
+
+  .. code-block:: console
+
+    $ odoo.exe -d <database_name> -u web --stop-after-init
+
+* No need to manually launch the server, the service is running.
+  You should be able to connect to your Odoo Enterprise instance using your usual
+  mean of identification. You can then link your database with your Odoo Enterprise
+  Subscription by entering the code you received by e-mail in the form input
diff --git a/doc/setup/enterprise/db_manager.png b/doc/setup/enterprise/db_manager.png
new file mode 100644
index 00000000000..7805e101946
Binary files /dev/null and b/doc/setup/enterprise/db_manager.png differ
diff --git a/doc/setup/enterprise/enterprise_code.png b/doc/setup/enterprise/enterprise_code.png
new file mode 100644
index 00000000000..af4af289e91
Binary files /dev/null and b/doc/setup/enterprise/enterprise_code.png differ
diff --git a/doc/setup/enterprise/windows_setup.png b/doc/setup/enterprise/windows_setup.png
new file mode 100644
index 00000000000..8c790579cb8
Binary files /dev/null and b/doc/setup/enterprise/windows_setup.png differ
diff --git a/doc/setup/enterprise/windows_uninstall.png b/doc/setup/enterprise/windows_uninstall.png
new file mode 100644
index 00000000000..14e287d0ec9
Binary files /dev/null and b/doc/setup/enterprise/windows_uninstall.png differ