diff --git a/aider/main.py b/aider/main.py
index ccdeeaa34..4b9267e44 100644
--- a/aider/main.py
+++ b/aider/main.py
@@ -796,9 +796,10 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
 
     ignores = []
     if git_root:
-        ignores +=  [str(Path(git_root) / ".gitignore")]
-    # ai: add aiderignores too!
-    io.file_watcher = FileWatcher(coder, encoding=self.encoding, gitignores=gitignore)
+        ignores.append(str(Path(git_root) / ".gitignore"))
+        if args.aiderignore:
+            ignores.append(str(Path(git_root) / args.aiderignore))
+    io.file_watcher = FileWatcher(coder.root, encoding=io.encoding, gitignores=ignores)
 
     coder.show_announcements()