diff --git a/bin/gpsmap.py b/bin/gpsmap.py
index 6565b40..f18820d 100644
--- a/bin/gpsmap.py
+++ b/bin/gpsmap.py
@@ -531,8 +531,13 @@ def main():
         print(f"Media directory not found: {media_dir}")
         sys.exit(1)
 
-    output_dir.mkdir(parents=True, exist_ok=True)
-    output_png = output_dir / f"{media_dir.resolve().name}.png"
+    output_arg = output_dir
+    if output_arg.suffix == ".png":
+        output_png = output_arg
+        output_png.parent.mkdir(parents=True, exist_ok=True)
+    else:
+        output_dir.mkdir(parents=True, exist_ok=True)
+        output_png = output_dir / f"{media_dir.resolve().name}.png"
 
     items = collect_media(media_dir)
     if not items: