diff --git a/UPGRADE-5.9.md b/UPGRADE-5.9.md
index 38a5750d6e..f9d087af93 100644
--- a/UPGRADE-5.9.md
+++ b/UPGRADE-5.9.md
@@ -12,6 +12,12 @@ DashboardBundle
 * Passing a command classname for the "$command" argument in `Kunstmaan\DashboardBundle\Widget\DashboardWidget::__construct` is deprecated and will not be allowed 6.0. Pass a command name instead.
 * Using the `kunstmaan_dashboard.widget.googleanalytics.command` parameter to modify the `kunstmaan_dashboard.widget.googleanalytics` service is deprecated and the parameter will be removed in 6.0. Use service decoration or a service alias instead.
 
+GeneratorBundle
+------------
+
+* The "kuma:generate:bundle" command and related classes is deprecated and will be removed in 6.0
+* The "kuma:generate:entity" command and related classes is deprecated and will be removed in 6.0, use the "make:entity" command of the symfony/maker-bundle.
+
 NodeSearchBundle
 ------------
 
diff --git a/src/Kunstmaan/GeneratorBundle/Command/GenerateBundleCommand.php b/src/Kunstmaan/GeneratorBundle/Command/GenerateBundleCommand.php
index 31525008b1..982cc1ff5f 100644
--- a/src/Kunstmaan/GeneratorBundle/Command/GenerateBundleCommand.php
+++ b/src/Kunstmaan/GeneratorBundle/Command/GenerateBundleCommand.php
@@ -17,7 +17,9 @@
 use Symfony\Component\HttpKernel\KernelInterface;
 
 /**
- * Generates bundles.
+ * @deprecated since KunstmaanGeneratorBundle 5.9 and will be removed in KunstmaanGeneratorBundle 6.0.
+ *
+ * NEXT_MAJOR Remove command, generator and related skeleton templates
  */
 class GenerateBundleCommand extends GeneratorCommand
 {
@@ -65,6 +67,8 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        @trigger_error(sprintf('The "kuma:generate:bundle" command is deprecated since KunstmaanGeneratorBundle 5.9 and will be removed in KunstmaanGeneratorBundle 6.0.'), E_USER_DEPRECATED);
+
         $questionHelper = $this->getQuestionHelper();
 
         if ($input->isInteractive()) {
diff --git a/src/Kunstmaan/GeneratorBundle/Command/GenerateEntityCommand.php b/src/Kunstmaan/GeneratorBundle/Command/GenerateEntityCommand.php
index 6698f418d2..cde75d4b6e 100644
--- a/src/Kunstmaan/GeneratorBundle/Command/GenerateEntityCommand.php
+++ b/src/Kunstmaan/GeneratorBundle/Command/GenerateEntityCommand.php
@@ -7,7 +7,9 @@
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
 /**
- * GenerateEntityCommand
+ * @deprecated since KunstmaanGeneratorBundle 5.9 and will be removed in KunstmaanGeneratorBundle 6.0.
+ *
+ * NEXT_MAJOR Remove command, generator and related skeleton templates
  */
 class GenerateEntityCommand extends KunstmaanGenerateCommand
 {
@@ -89,6 +91,8 @@ protected function getWelcomeText()
      */
     protected function doExecute()
     {
+        @trigger_error(sprintf('The "kuma:generate:entity" command is deprecated since KunstmaanGeneratorBundle 5.9 and will be removed in KunstmaanGeneratorBundle 6.0. Use the "make:entity" command of the symfony/maker-bundle instead.'), E_USER_DEPRECATED);
+
         $this->assistant->writeSection('Entity generation');
 
         $this->createGenerator()->generate($this->bundle, $this->entityName, $this->prefix, $this->fields, $this->withRepository);
diff --git a/src/Kunstmaan/GeneratorBundle/Generator/BundleGenerator.php b/src/Kunstmaan/GeneratorBundle/Generator/BundleGenerator.php
index 7b24c34cea..974dd38c99 100644
--- a/src/Kunstmaan/GeneratorBundle/Generator/BundleGenerator.php
+++ b/src/Kunstmaan/GeneratorBundle/Generator/BundleGenerator.php
@@ -6,7 +6,7 @@
 use Symfony\Component\DependencyInjection\Container;
 
 /**
- * Generates a bundle.
+ * @deprecated since KunstmaanGeneratorBundle 5.9 and will be removed in KunstmaanGeneratorBundle 6.0.
  */
 class BundleGenerator extends Generator
 {
diff --git a/src/Kunstmaan/GeneratorBundle/Generator/DefaultEntityGenerator.php b/src/Kunstmaan/GeneratorBundle/Generator/DefaultEntityGenerator.php
index 370e6745e3..ae0c7025ac 100644
--- a/src/Kunstmaan/GeneratorBundle/Generator/DefaultEntityGenerator.php
+++ b/src/Kunstmaan/GeneratorBundle/Generator/DefaultEntityGenerator.php
@@ -6,7 +6,7 @@
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
 /**
- * DefaultEntityGenerator
+ * @deprecated @deprecated since KunstmaanGeneratorBundle 5.9 and will be removed in KunstmaanGeneratorBundle 6.0.
  */
 class DefaultEntityGenerator extends KunstmaanGenerator
 {