diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4218e5d..520e2c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ Twitch Downloader change log
 -------------------
 
 * Added `source` as alias for best available quality (#33)
+* Added `--no-join` option to `download` to skip ffmpeg join (#36)
 
 1.11.0 (2020-09-03)
 -------------------
diff --git a/twitchdl/commands.py b/twitchdl/commands.py
index 72811d6..0173501 100644
--- a/twitchdl/commands.py
+++ b/twitchdl/commands.py
@@ -301,6 +301,11 @@ def _download_video(video_id, args):
     playlist_path = path.join(target_dir, "playlist_downloaded.m3u8")
     playlist.dump(playlist_path)
 
+    if args.no_join:
+        print_out("\n\n<dim>Skipping joining files...</dim>")
+        print_out("VODs downloaded to:\n<blue>{}</blue>".format(target_dir))
+        return
+
     print_out("\n\nJoining files...")
     target = _video_target_filename(video, args.format)
     _join_vods(playlist_path, target)
diff --git a/twitchdl/console.py b/twitchdl/console.py
index f5764d4..b291356 100644
--- a/twitchdl/console.py
+++ b/twitchdl/console.py
@@ -118,6 +118,11 @@ COMMANDS = [
                 "help": "Video quality, e.g. 720p. Set to 'source' to get best quality.",
                 "type": str,
             }),
+            (["--no-join"], {
+                "help": "Don't run ffmpeg to join the downloaded vods, implies --keep.",
+                "action": "store_true",
+                "default": False,
+            }),
         ],
     ),
 ]