diff --git a/plugins/CoreConsole/Commands/GeneratePlugin.php b/plugins/CoreConsole/Commands/GeneratePlugin.php
index 45fa111d87a..14fa6e0c103 100644
--- a/plugins/CoreConsole/Commands/GeneratePlugin.php
+++ b/plugins/CoreConsole/Commands/GeneratePlugin.php
@@ -69,8 +69,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 '/ExamplePlugin.php',
                 '/plugin.json',
                 '/README.md',
+                '/CHANGELOG.md',
                 '/screenshots',
                 '/screenshots/.gitkeep',
+                '/docs',
+                '/docs/faq.md',
+                '/docs/index.md',
             );
         }
 
diff --git a/plugins/ExamplePlugin/CHANGELOG.md b/plugins/ExamplePlugin/CHANGELOG.md
new file mode 100644
index 00000000000..854631896a5
--- /dev/null
+++ b/plugins/ExamplePlugin/CHANGELOG.md
@@ -0,0 +1,3 @@
+## Changelog
+
+Here goes the changelog text.
diff --git a/plugins/ExamplePlugin/README.md b/plugins/ExamplePlugin/README.md
index c9c3266859c..fa70e946c87 100644
--- a/plugins/ExamplePlugin/README.md
+++ b/plugins/ExamplePlugin/README.md
@@ -4,12 +4,3 @@
 
 Add your plugin description here.
 
-## FAQ
-
-__My question?__
-
-My answer
-
-## Changelog
-
-Here goes the changelog text.
diff --git a/plugins/ExamplePlugin/docs/faq.md b/plugins/ExamplePlugin/docs/faq.md
new file mode 100644
index 00000000000..dde17aa5cc2
--- /dev/null
+++ b/plugins/ExamplePlugin/docs/faq.md
@@ -0,0 +1,5 @@
+## FAQ
+
+__My question?__
+
+My answer
\ No newline at end of file
diff --git a/plugins/ExamplePlugin/docs/index.md b/plugins/ExamplePlugin/docs/index.md
new file mode 100644
index 00000000000..70135e8e6a5
--- /dev/null
+++ b/plugins/ExamplePlugin/docs/index.md
@@ -0,0 +1 @@
+## Documentation
\ No newline at end of file
diff --git a/plugins/ExampleTheme/CHANGELOG.md b/plugins/ExampleTheme/CHANGELOG.md
new file mode 100644
index 00000000000..854631896a5
--- /dev/null
+++ b/plugins/ExampleTheme/CHANGELOG.md
@@ -0,0 +1,3 @@
+## Changelog
+
+Here goes the changelog text.
diff --git a/plugins/ExampleTheme/README.md b/plugins/ExampleTheme/README.md
index de7cfecaa11..0cb889be355 100644
--- a/plugins/ExampleTheme/README.md
+++ b/plugins/ExampleTheme/README.md
@@ -3,12 +3,3 @@
 ## Description
 
 Add your theme description here.
-
-## FAQ
-
-__My question?__
-My answer
-
-## Changelog
-
-Here goes the changelog text.
diff --git a/plugins/ExampleTheme/docs/faq.md b/plugins/ExampleTheme/docs/faq.md
new file mode 100644
index 00000000000..dde17aa5cc2
--- /dev/null
+++ b/plugins/ExampleTheme/docs/faq.md
@@ -0,0 +1,5 @@
+## FAQ
+
+__My question?__
+
+My answer
\ No newline at end of file
diff --git a/plugins/ExampleTheme/docs/index.md b/plugins/ExampleTheme/docs/index.md
new file mode 100644
index 00000000000..70135e8e6a5
--- /dev/null
+++ b/plugins/ExampleTheme/docs/index.md
@@ -0,0 +1 @@
+## Documentation
\ No newline at end of file