diff --git a/core/fosuser-bundle.md b/core/fosuser-bundle.md
index 8f62aaaaaa8..a4a091359eb 100644
--- a/core/fosuser-bundle.md
+++ b/core/fosuser-bundle.md
@@ -82,4 +82,4 @@ class User extends BaseUser
 
 Previous chapter: [Accept application/x-www-form-urlencoded Form Data](form-data.md)
 
-Next chapter: [Adding a JWT authentication using `LexikJWTAuthenticationBundle`](jwt.md)
+Next chapter: [Adding a OAuth2 authentication using `FOSOAuthServerBundle`](oauth2.md)
diff --git a/core/jwt.md b/core/jwt.md
index 551e87616f1..27494d0a8f0 100644
--- a/core/jwt.md
+++ b/core/jwt.md
@@ -28,7 +28,7 @@ security:
     providers:
         fos_userbundle:
             id: fos_user.user_provider.username
-            
+
     firewalls:
         login:
             pattern:  ^/login
@@ -60,6 +60,6 @@ security:
         - { path: ^/, roles: [ ROLE_READER ] }
 ```       
 
-Previous chapter: [FOSUserBundle Integration](fosuser-bundle.md)
+Previous chapter: [Adding a OAuth2 authentication using `FOSOAuthServerBundle`](oauth2.md)
 
 Next chapter: [NelmioApiDocBundle integration](nelmio-api-doc.md)
diff --git a/core/oauth2.md b/core/oauth2.md
new file mode 100644
index 00000000000..89709199888
--- /dev/null
+++ b/core/oauth2.md
@@ -0,0 +1,340 @@
+# Adding a OAuth2 authentication using `FOSOAuthServerBundle`
+
+> [OAuth](https://oauth.net/2/) is an open standard for authorization, commonly used as a way for Internet users to authorize websites or applications to access their information on other websites but without giving them the passwords.[1] This mechanism is used by companies such as Google, Facebook, Microsoft and Twitter to permit the users to share information about their accounts with third party applications or websites.
+
+[Wikipedia](https://en.wikipedia.org/wiki/OAuth)
+
+API Platform allows to easily add a OAuth2-based authentication to your API using [FOSOAuthServerBundle](https://github.com/FriendsOfSymfony/FOSOAuthServerBundle).
+
+API Platform is fully working with [FOSOAuthServerBundle](https://github.com/FriendsOfSymfony/FOSOAuthServerBundle).
+
+This tutorial is based on [Getting Started With FOSOAuthServerBundle](https://github.com/FriendsOfSymfony/FOSOAuthServerBundle/blob/master/Resources/doc/index.md) and [Basic RESTful API with Symfony 2 + FOSRestBundle (JSON format only) + FOSUserBundle + FOSOauthServerBundle](https://gist.github.com/tjamps/11d617a4b318d65ca583)
+
+## Install FOSOauthServerBundle
+
+Install the bundle with composer:
+
+```bash
+composer require friendsofsymfony/oauth-server-bundle
+```
+
+Enable the bundle in the kernel:
+
+```php
+<?php
+// app/AppKernel.php
+
+public function registerBundles()
+{
+    $bundles = array(
+        // ...
+        new FOS\OAuthServerBundle\FOSOAuthServerBundle(),
+    );
+}
+```
+
+## Create oauth2 entites
+
+Add all the following classes to your entities and run `php bin/console doctrine:schema:update --force`:
+
+`AppBundle/Entity/AccessToken.php`
+
+```php
+<?php
+
+namespace AppBundle\Entity;
+
+use FOS\OAuthServerBundle\Entity\AccessToken as BaseAccessToken;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ */
+class AccessToken extends BaseAccessToken
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Client")
+     * @ORM\JoinColumn(nullable=false)
+     */
+    protected $client;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\User")
+     */
+    protected $user;
+}
+```
+
+`AppBundle/Entity/AuthCode.php`
+
+```php
+<?php
+
+namespace AppBundle\Entity;
+
+use FOS\OAuthServerBundle\Entity\AuthCode as BaseAuthCode;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ */
+class AuthCode extends BaseAuthCode
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Client")
+     * @ORM\JoinColumn(nullable=false)
+     */
+    protected $client;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\User")
+     */
+    protected $user;
+}
+
+```
+
+`AppBundle/Entity/Client.php`
+
+```php
+<?php
+
+namespace AppBundle\Entity;
+
+use FOS\OAuthServerBundle\Entity\Client as BaseClient;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ */
+class Client extends BaseClient
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    public function __construct()
+    {
+        parent::__construct();
+        // your own logic
+    }
+}
+
+```
+
+`AppBundle/Entity/RefreshToken.php`
+
+```php
+<?php
+
+namespace AppBundle\Entity;
+
+use FOS\OAuthServerBundle\Entity\RefreshToken as BaseRefreshToken;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ */
+class RefreshToken extends BaseRefreshToken
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Client")
+     * @ORM\JoinColumn(nullable=false)
+     */
+    protected $client;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\User")
+     */
+    protected $user;
+}
+
+```
+
+`AppBundle/Entity/User.php`
+
+Add the file from the [FOSUserBundle Integration](fosuser-bundle.md#creating-a-user-entity-with-serialization-groups).
+
+## Security Configuration
+
+```yaml
+# To get started with security, check out the documentation:
+# http://symfony.com/doc/current/book/security.html
+security:
+
+    encoders:
+        FOS\UserBundle\Model\UserInterface: bcrypt
+
+    providers:
+        fos_user_bundle:
+            id: fos_user.user_provider.username
+
+    firewalls:
+        # disables authentication for assets and the profiler, adapt it according to your needs
+        dev:
+            pattern: ^/(_(profiler|wdt)|css|images|js)/
+            security: false
+
+        oauth_token:
+            pattern:    ^/oauth/v2/token
+            security:   false
+
+        oauth_authorize:
+            pattern:    ^/oauth/v2/auth
+            # Add your favorite authentication process here
+
+        api_docs:
+            pattern: ^/(|docs.json|docs.jsonld|index.json)$
+            form_login: false            
+            provider: fos_user_bundle
+            http_basic:
+                realm: "Please enter your login data."
+
+        api:
+            pattern:   ^/.+
+            fos_oauth: true
+            stateless: true
+            anonymous: true
+
+    access_control:
+        - { path: ^/.+, roles: [ IS_AUTHENTICATED_FULLY ] }
+
+```
+
+## Routing Configuration
+
+```yaml
+api:
+    resource: '.'
+    type:     'api_platform'
+
+fos_oauth_server_token:
+    resource: "@FOSOAuthServerBundle/Resources/config/routing/token.xml"
+
+fos_oauth_server_authorize:
+    resource: "@FOSOAuthServerBundle/Resources/config/routing/authorize.xml"
+```
+
+## Create clients
+
+Add this class to `AppBundle/Command/CreateOAuthClientCommand.php` to generate oauth clients via console:
+
+```php
+<?php
+
+namespace AppBundle\Command;
+
+use AppBundle\Entity\Client;
+use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class CreateOAuthClientCommand extends ContainerAwareCommand
+{
+    protected function configure()
+    {
+        $this
+            ->setName('oauth:client:create')
+            ->setDescription('Create OAuth Client')
+            ->addArgument(
+                'grantType',
+                InputArgument::REQUIRED,
+                'Grant Type?'
+            )
+            ->addArgument(
+                'redirectUri',
+                InputArgument::OPTIONAL,
+                'Redirect URI?'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $container = $this->getContainer();
+        $redirectUri = $input->getArgument('redirectUri');
+        $grantType = $input->getArgument('grantType');
+
+        $clientManager = $container->get('fos_oauth_server.client_manager.default');
+        /** @var Client $client */
+        $client = $clientManager->createClient();
+        $client->setRedirectUris($redirectUri ? [$redirectUri] : []);
+        $client->setAllowedGrantTypes([$grantType]);
+        $clientManager->updateClient($client);
+
+        $output->writeln(sprintf("<info>The client <comment>%s</comment> was created with <comment>%s</comment> as public id and <comment>%s</comment> as secret</info>",
+            $client->getId(),
+            $client->getPublicId(),
+            $client->getSecret()
+        ));
+    }
+}
+```
+
+Now you can generate two clients. One for our swagger api documentation and one for our application that wants to get data from our api.
+
+```bash
+# Swagger api documentation client
+php bin/console oauth:client:create password
+
+# Application client
+php bin/console oauth:client:create client_credentials
+```
+
+## OAuth2 Configuration
+
+Add the following code to your `app/config/config.yml` and replace the `clientId` and `clientSecret` with the data from the generated application client with the `client_credentials` grant type.
+
+```yaml
+# ...
+fos_oauth_server:
+    db_driver: orm       # Drivers available: orm, mongodb, or propel
+    client_class:        AppBundle\Entity\Client
+    access_token_class:  AppBundle\Entity\AccessToken
+    refresh_token_class: AppBundle\Entity\RefreshToken
+    auth_code_class:     AppBundle\Entity\AuthCode
+    service:
+        user_provider: fos_user.user_provider.username
+        options:
+            access_token_lifetime: 10800
+            supported_scopes: user
+
+api_platform:
+    # ...
+    oauth:
+        enabled: true
+        clientId: 'enter-swagger-api-documentation-client-id'
+        clientSecret: 'enter-swagger-api-documentation-client-secret'
+```
+
+That's all, now your OAuth2 authentication should work.
+
+
+Previous chapter: [FOSUserBundle Integration](fosuser-bundle.md)
+
+Next chapter: [Adding a JWT authentication using `LexikJWTAuthenticationBundle`](jwt.md)
diff --git a/index.md b/index.md
index 44f5b35a440..29d7d91fb0d 100644
--- a/index.md
+++ b/index.md
@@ -70,7 +70,7 @@
       1. [Max Joins](core/performance.md#max-joins)
       2. [Force Eager](core/performance.md#force-eager)
       3. [Override at Resource and Operation Level](core/performance.md#override-at-resource-and-operation-level)
-      4. [Disable Eager Loading](core/performance.md#disable-eager-loading) 
+      4. [Disable Eager Loading](core/performance.md#disable-eager-loading)
 18. [Operation Path Naming](core/operation-path-naming.md)
   1. [Configuration](core/operation-path-naming.md#configuration)
   2. [Create a Custom Operation Path Naming](core/operation-path-naming.md#create-a-custom-operation-path-resolver)
@@ -80,9 +80,16 @@
 19. [Accept `application/x-www-form-urlencoded` Form Data] (core/form-data.md)
 20. [FOSUserBundle Integration](core/fosuser-bundle.md)
   1. [Creating a `User` Entity with Serialization Groups](core/fosuser-bundle.md#creating-a-user-entity-with-serialization-groups)
-21. [Adding a JWT authentication using LexikJWTAuthenticationBundle](core/jwt.md)  
-22. [NelmioApiDocBundle integration](core/nelmio-api-doc.md)
-23. [AngularJS Integration](core/angularjs-integration.md)
+21. [Adding a OAuth2 authentication using `FOSOAuthServerBundle`](oauth2.md)
+  1. [Install FOSOauthServerBundle](oauth2.md#install-fosoauthserverbundle)
+  2. [Create oauth2 entites](oauth2.md#create-oauth2-entites)
+  3. [Security Configuration](oauth2.md#security-configuration)
+  4. [Routing Configuration](oauth2.md#routing-configuration)
+  5. [Create clients](oauth2.md#create-clients)
+  6. [OAuth2 Configuration](oauth2.md#oauth2-configuration)
+22. [Adding a JWT authentication using LexikJWTAuthenticationBundle](core/jwt.md)
+23. [NelmioApiDocBundle integration](core/nelmio-api-doc.md)
+24. [AngularJS Integration](core/angularjs-integration.md)
   1. [Restangular](core/angularjs-integration.md#restangular)
   2. [ng-admin](core/angularjs-integration.md#ng-admin)