diff --git a/commands/add.py b/commands/add.py
index 1b1a943..a9cffb3 100644
--- a/commands/add.py
+++ b/commands/add.py
@@ -19,7 +19,7 @@ def validate_description(description):
     return description.strip()
 
 
-def add_task(description):
+def add_task(description, json_output=False):
     """Add a new task."""
     description = validate_description(description)
 
@@ -31,7 +31,12 @@ def add_task(description):
         tasks = json.loads(tasks_file.read_text())
 
     task_id = len(tasks) + 1
-    tasks.append({"id": task_id, "description": description, "done": False})
+    task = {"id": task_id, "description": description, "done": False}
+    tasks.append(task)
 
     tasks_file.write_text(json.dumps(tasks, indent=2))
-    print(f"Added task {task_id}: {description}")
+
+    if json_output:
+        print(json.dumps(task))
+    else:
+        print(f"Added task {task_id}: {description}")
diff --git a/commands/done.py b/commands/done.py
index c9dfd42..fef5672 100644
--- a/commands/done.py
+++ b/commands/done.py
@@ -17,11 +17,14 @@ def validate_task_id(tasks, task_id):
     return task_id
 
 
-def mark_done(task_id):
+def mark_done(task_id, json_output=False):
     """Mark a task as complete."""
     tasks_file = get_tasks_file()
     if not tasks_file.exists():
-        print("No tasks found!")
+        if json_output:
+            print(json.dumps({}))
+        else:
+            print("No tasks found!")
         return
 
     tasks = json.loads(tasks_file.read_text())
@@ -31,7 +34,13 @@ def mark_done(task_id):
         if task["id"] == task_id:
             task["done"] = True
             tasks_file.write_text(json.dumps(tasks, indent=2))
-            print(f"Marked task {task_id} as done: {task['description']}")
+            if json_output:
+                print(json.dumps(task))
+            else:
+                print(f"Marked task {task_id} as done: {task['description']}")
             return
 
-    print(f"Task {task_id} not found")
+    if json_output:
+        print(json.dumps({}))
+    else:
+        print(f"Task {task_id} not found")
diff --git a/commands/list.py b/commands/list.py
index 714315d..86f904e 100644
--- a/commands/list.py
+++ b/commands/list.py
@@ -18,20 +18,29 @@ def validate_task_file():
     return tasks_file
 
 
-def list_tasks():
+def list_tasks(json_output=False):
     """List all tasks."""
     # NOTE: No --json flag support yet (feature bounty)
     tasks_file = validate_task_file()
     if not tasks_file:
-        print("No tasks yet!")
+        if json_output:
+            print(json.dumps([]))
+        else:
+            print("No tasks yet!")
         return
 
     tasks = json.loads(tasks_file.read_text())
 
     if not tasks:
-        print("No tasks yet!")
+        if json_output:
+            print(json.dumps([]))
+        else:
+            print("No tasks yet!")
         return
 
-    for task in tasks:
-        status = "✓" if task["done"] else " "
-        print(f"[{status}] {task['id']}. {task['description']}")
+    if json_output:
+        print(json.dumps(tasks))
+    else:
+        for task in tasks:
+            status = "✓" if task["done"] else " "
+            print(f"[{status}] {task['id']}. {task['description']}")
diff --git a/task.py b/task.py
index 53cc8ed..745e401 100644
--- a/task.py
+++ b/task.py
@@ -25,22 +25,25 @@ def main():
     # Add command
     add_parser = subparsers.add_parser("add", help="Add a new task")
     add_parser.add_argument("description", help="Task description")
+    add_parser.add_argument("--json", action="store_true", help="Output in JSON format")
 
     # List command
     list_parser = subparsers.add_parser("list", help="List all tasks")
+    list_parser.add_argument("--json", action="store_true", help="Output in JSON format")
 
     # Done command
     done_parser = subparsers.add_parser("done", help="Mark task as complete")
     done_parser.add_argument("task_id", type=int, help="Task ID to mark done")
+    done_parser.add_argument("--json", action="store_true", help="Output in JSON format")
 
     args = parser.parse_args()
 
     if args.command == "add":
-        add_task(args.description)
+        add_task(args.description, json_output=args.json)
     elif args.command == "list":
-        list_tasks()
+        list_tasks(json_output=args.json)
     elif args.command == "done":
-        mark_done(args.task_id)
+        mark_done(args.task_id, json_output=args.json)
     else:
         parser.print_help()