diff --git a/.gitignore b/.gitignore
index 70ccb0445..1c9659b90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,4 +73,4 @@ tags
 .DS_Store
 
 # autogenerated include-all.rst files
-**include-all.rst
\ No newline at end of file
+**include-all.rst
diff --git a/plugins/CMakeLists.custom.txt b/plugins/CMakeLists.custom.txt
new file mode 100644
index 000000000..35a9d0efc
--- /dev/null
+++ b/plugins/CMakeLists.custom.txt
@@ -0,0 +1,3 @@
+# You can add custom plugins here to avoid touching plugins/CMakeLists.txt,
+# This can be useful if you've made modifications to that file and try to
+# switch between branches that have also made modifications to it.
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 115f6196e..aee9d1421 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -180,3 +180,5 @@ OPTION(BUILD_SKELETON "Build the skeleton plugin." OFF)
 if(BUILD_SKELETON)
     add_subdirectory(skeleton)
 endif()
+
+INCLUDE(CMakeLists.custom.txt)