diff --git a/client/cli/bam.py b/client/cli/bam.py
index f34566f..2fb056b 100755
--- a/client/cli/bam.py
+++ b/client/cli/bam.py
@@ -155,6 +155,26 @@ class bam_config:
                     sort_keys=True, indent=4, separators=(',', ': '),
                     )
 
+    @staticmethod
+    def create_bamignore_filter(id_=".bamignore", cwd=None):
+        path = bam_config.find_rootdir()
+        import os
+        bamignore = os.path.join(path, id_)
+        if os.path.isfile(bamignore):
+            with open(bamignore, 'r') as f:
+                patterns = f.read().split("\n")
+                def filter_ignore(f):
+                    import re
+                    for pattern in filter_ignore.patterns:
+                        if re.match(pattern, f):
+                            return False
+                    return True
+                filter_ignore.patterns = patterns
+
+                return filter_ignore
+        else:
+            return None
+
 
 class bam_session:
     # fake module
@@ -220,14 +240,9 @@ class bam_session:
                     if filename_check is None or filename_check(filepath):
                         yield filepath
 
-        def bamignore_check(fn):
-            # TODO(cam)
-            # .bamignore
-            if fn.endswith(".blend1"):
-                return False
-            return True
+        bamignore_filter = bam_config.create_bamignore_filter()
 
-        for fn_abs in iter_files(session_rootdir, bamignore_check):
+        for fn_abs in iter_files(session_rootdir, bamignore_filter):
             if fn_abs not in paths_used:
                 # we should be clever - add the file to a useful location based on some rules
                 # (category, filetype & tags?)
diff --git a/tests/test_cli.py b/tests/test_cli.py
index ca222fe..bc1112e 100755
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -1005,6 +1005,46 @@ class BamRelativeAbsoluteTest(BamSessionTestCase):
         self.helper_test_from_liblinks(blendfile, liblinks_src, liblinks_dst)
 
 
+class BamIgnoreTest(BamSessionTestCase):
+    """Checks out a project, creates a .bamignore file with a few rules
+    and tries to commit files that violate them.
+    """
+    def __init__(self, *args):
+        self.init_defaults()
+        super().__init__(*args)
+
+    def test_ignore(self):
+        session_name = "mysession"
+        file_name = "testfile.txt"
+        file_data = b"hello world!\n"
+
+        # Regular expressions for smart people
+        file_data_bamignore = r""".*\.txt$
+.*/subfolder/.*"""
+
+        proj_path, session_path = self.init_session(session_name)
+
+        # write the .bamignore in the session root
+        file_quick_write(proj_path, ".bamignore", file_data_bamignore)
+
+        # create some files
+        file_quick_write(session_path, file_name, file_data)
+
+        import os
+        subdir_path = os.path.join(session_path, "subfolder")
+        os.makedirs(subdir_path)
+        file_quick_write(subdir_path, "testfile.blend1", file_data)
+
+        # now check for status
+        stdout, stderr = bam_run(["status",], session_path)
+        self.assertEqual("", stderr)
+
+        # try to commit
+        stdout, stderr = bam_run(["commit", "-m", "test message"], session_path)
+        self.assertEqual("", stderr)
+        self.assertEqual("Nothing to commit!\n", stdout)
+
+
 if __name__ == '__main__':
     data = global_setup()
     unittest.main(exit=False)