diff --git a/api-platform/core/2.1/post-install.txt b/api-platform/core/2.1/post-install.txt
index 1b67b54a..613c2b80 100644
--- a/api-platform/core/2.1/post-install.txt
+++ b/api-platform/core/2.1/post-install.txt
@@ -1,8 +1,10 @@
   * Your API is almost ready:
-    1. Create your first API resource in <info>src/Entity</info>;
+    1. Create your first API resource in <info>src/ApiResource</info>;
     2. Go to <info>/api</info> to browse your API
 
+  * Using MakerBundle? Try <info>php bin/console make:entity --api-resource</info> 
+
   * To enable the GraphQL support, run <comment>composer require webonyx/graphql-php</>,
     then browse <info>/api/graphql</info>.
 
-  * <fg=blue>Read</> the documentation at <comment>https://api-platform.com/docs</>
+  * <fg=blue>Read</> the documentation at <comment>https://api-platform.com/docs/</>
diff --git a/api-platform/core/2.5/post-install.txt b/api-platform/core/2.5/post-install.txt
index 1b67b54a..613c2b80 100644
--- a/api-platform/core/2.5/post-install.txt
+++ b/api-platform/core/2.5/post-install.txt
@@ -1,8 +1,10 @@
   * Your API is almost ready:
-    1. Create your first API resource in <info>src/Entity</info>;
+    1. Create your first API resource in <info>src/ApiResource</info>;
     2. Go to <info>/api</info> to browse your API
 
+  * Using MakerBundle? Try <info>php bin/console make:entity --api-resource</info> 
+
   * To enable the GraphQL support, run <comment>composer require webonyx/graphql-php</>,
     then browse <info>/api/graphql</info>.
 
-  * <fg=blue>Read</> the documentation at <comment>https://api-platform.com/docs</>
+  * <fg=blue>Read</> the documentation at <comment>https://api-platform.com/docs/</>
diff --git a/api-platform/core/3.0/post-install.txt b/api-platform/core/3.0/post-install.txt
index 5cfe0951..613c2b80 100644
--- a/api-platform/core/3.0/post-install.txt
+++ b/api-platform/core/3.0/post-install.txt
@@ -2,7 +2,9 @@
     1. Create your first API resource in <info>src/ApiResource</info>;
     2. Go to <info>/api</info> to browse your API
 
+  * Using MakerBundle? Try <info>php bin/console make:entity --api-resource</info> 
+
   * To enable the GraphQL support, run <comment>composer require webonyx/graphql-php</>,
     then browse <info>/api/graphql</info>.
 
-  * <fg=blue>Read</> the documentation at <comment>https://api-platform.com/docs</>
+  * <fg=blue>Read</> the documentation at <comment>https://api-platform.com/docs/</>
diff --git a/api-platform/core/3.1/config/packages/api_platform.yaml b/api-platform/core/3.1/config/packages/api_platform.yaml
new file mode 100644
index 00000000..41c79934
--- /dev/null
+++ b/api-platform/core/3.1/config/packages/api_platform.yaml
@@ -0,0 +1,10 @@
+api_platform:
+    title: Hello API Platform
+    version: 1.0.0
+    # Good defaults for REST APIs
+    defaults:
+        stateless: true
+        cache_headers:
+            vary: ['Content-Type', 'Authorization', 'Origin']
+        extra_properties:
+            standard_put: true
diff --git a/api-platform/core/3.1/config/routes/api_platform.yaml b/api-platform/core/3.1/config/routes/api_platform.yaml
new file mode 100644
index 00000000..38f11cba
--- /dev/null
+++ b/api-platform/core/3.1/config/routes/api_platform.yaml
@@ -0,0 +1,4 @@
+api_platform:
+    resource: .
+    type: api_platform
+    prefix: /api
diff --git a/api-platform/core/3.1/manifest.json b/api-platform/core/3.1/manifest.json
new file mode 100644
index 00000000..af164523
--- /dev/null
+++ b/api-platform/core/3.1/manifest.json
@@ -0,0 +1,9 @@
+{
+    "bundles": {
+        "ApiPlatform\\Symfony\\Bundle\\ApiPlatformBundle": ["all"]
+    },
+    "copy-from-recipe": {
+        "config/": "%CONFIG_DIR%/",
+        "src/": "%SRC_DIR%/"
+    }
+}
diff --git a/api-platform/core/3.1/post-install.txt b/api-platform/core/3.1/post-install.txt
new file mode 100644
index 00000000..613c2b80
--- /dev/null
+++ b/api-platform/core/3.1/post-install.txt
@@ -0,0 +1,10 @@
+  * Your API is almost ready:
+    1. Create your first API resource in <info>src/ApiResource</info>;
+    2. Go to <info>/api</info> to browse your API
+
+  * Using MakerBundle? Try <info>php bin/console make:entity --api-resource</info> 
+
+  * To enable the GraphQL support, run <comment>composer require webonyx/graphql-php</>,
+    then browse <info>/api/graphql</info>.
+
+  * <fg=blue>Read</> the documentation at <comment>https://api-platform.com/docs/</>
diff --git a/api-platform/core/3.1/src/ApiResource/.gitignore b/api-platform/core/3.1/src/ApiResource/.gitignore
new file mode 100644
index 00000000..e69de29b