diff --git a/doc/releases/1.4.0pre2.txt b/doc/releases/1.4.0pre2.txt
index a5c10777aa..8acbda8a7a 100644
--- a/doc/releases/1.4.0pre2.txt
+++ b/doc/releases/1.4.0pre2.txt
@@ -31,6 +31,9 @@ backwards-incompatible user-facing changes
   This fixes potentially long client runs when comparing files that have
   diverged significantly.
 
+* Ignore directories containing a .bcfg2-ignore file in various plugins
+  (Bundler, Defaults, Pkgmgr, Properties, PuppetENC, TemplateHelper, Trigger).
+
 Thanks
 ------
 
diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py
index 5cfc8998c7..245cfc256d 100644
--- a/src/lib/Bcfg2/Server/Plugin/helpers.py
+++ b/src/lib/Bcfg2/Server/Plugin/helpers.py
@@ -456,7 +456,9 @@ def HandleEvent(self, event):  # pylint: disable=R0912
             # again without having to add a new monitor.
         elif os.path.isdir(abspath):
             # Deal with events for directories
-            if action in ['exists', 'created']:
+            if os.path.exists(os.path.join(abspath, '.bcfg2-ignore')):
+                self.logger.debug("Ignoring directory %s" % abspath)
+            elif action in ['exists', 'created']:
                 self.add_directory_monitor(relpath)
             elif action == 'changed':
                 if relpath in self.entries: