diff --git a/pkgs/default.nix b/pkgs/default.nix
index 220db08..df75e64 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -17,4 +17,15 @@ in
   };
 
   aria2_exporter = import srcs.aria2_exporter { pkgs = self; };
+
+  # FIXME: 21.05: Move to home-manager module package attribute
+  mpv-unwrapped = super.mpv-unwrapped.overrideAttrs (o: o // {
+    patches = [
+      # FIXME: 21.05: Remove since it has mpv 0.33
+      (super.fetchpatch {
+        url = "https://github.com/mpv-player/mpv/commit/43c13e5ea23230edca38426d4a9eed049a70890e.patch";
+        sha256 = "0g73ws36cs2hfzqck6xiaimj5yd5hz68b4wf3qayyv4nrf5sz02c";
+      })
+    ];
+  });
 }
diff --git a/users/simon/modules/mpv.nix b/users/simon/modules/mpv.nix
index 08ba95c..6be09c1 100644
--- a/users/simon/modules/mpv.nix
+++ b/users/simon/modules/mpv.nix
@@ -103,6 +103,9 @@ in
 
       # Lossless screenshots
       screenshot-format = "png";
+
+      # Use youtube-dl’s format configuration
+      ytdl-format = "ytdl";
     };
 
     bindings = {