diff --git a/.travis.yml b/.travis.yml
index ee917b3fbcdec73b4ba9725464920a9e53059e6d..b951418c6d1b62dc0e71d64d4e69acc7d786c647 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,11 @@
 # do not edit this file manually, instead run the generate:travis-yml console command
-# if you are a Piwik core developer, edit this template file to auto generate the travis.yml: https://github.com/piwik/piwik/blob/master/plugins/CoreConsole/templates/travis.yml.twig
+# if you are a Piwik core developer, edit this template file to auto generate the .travis.yml: https://github.com/piwik/piwik/blob/master/plugins/CoreConsole/templates/travis.yml.twig
+
+# when modifying this file, please consider whether your changes should apply to plugin .travis.yml files. if not, check whether the pluginName twig var is empty,
+# otherwise your changes will be synced with every plugin that uses an auto generated .travis.yml
+
+# also please test generation before committing by running ./console generate:travis-yml --core and ./console generate:travis-yml --plugin=CustomAlerts
+# and making sure the .travis.yml files are changed correctly
 
 language: php
 
diff --git a/plugins/CoreConsole/templates/travis.yml.twig b/plugins/CoreConsole/templates/travis.yml.twig
index 1add249a5b2558ffa5de2046a1f71f25424d1f6a..5829c4da58e5641696b046d6c6c51a04aeb70a69 100644
--- a/plugins/CoreConsole/templates/travis.yml.twig
+++ b/plugins/CoreConsole/templates/travis.yml.twig
@@ -1,5 +1,13 @@
 # do not edit this file manually, instead run the generate:travis-yml console command
-# if you are a Piwik core developer, edit this template file to auto generate the travis.yml: https://github.com/piwik/piwik/blob/master/plugins/CoreConsole/templates/travis.yml.twig
+{% if pluginName is empty %}
+# if you are a Piwik core developer, edit this template file to auto generate the .travis.yml: https://github.com/piwik/piwik/blob/master/plugins/CoreConsole/templates/travis.yml.twig
+
+# when modifying this file, please consider whether your changes should apply to plugin .travis.yml files. if not, check whether the pluginName twig var is empty,
+# otherwise your changes will be synced with every plugin that uses an auto generated .travis.yml
+
+# also please test generation before committing by running ./console generate:travis-yml --core and ./console generate:travis-yml --plugin=CustomAlerts
+# and making sure the .travis.yml files are changed correctly
+{% endif %}
 
 language: php