diff --git a/modules/universal/env/home-packages.nix b/modules/universal/env/home-packages.nix
index 3c407e3f1..bbd93fdd6 100644
--- a/modules/universal/env/home-packages.nix
+++ b/modules/universal/env/home-packages.nix
@@ -69,6 +69,7 @@ let
     inkscape
     libreoffice-fresh  # XXX colin: maybe don't want this on mobile
     lollypop
+    makemkv
     mesa-demos
     networkmanagerapplet
 
diff --git a/nixpatches/09-makemkv-1.17.1.patch b/nixpatches/09-makemkv-1.17.1.patch
new file mode 100644
index 000000000..46a462774
--- /dev/null
+++ b/nixpatches/09-makemkv-1.17.1.patch
@@ -0,0 +1,29 @@
+diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
+index 2c15513d4d6..1251a15cf1d 100644
+--- a/pkgs/applications/video/makemkv/default.nix
++++ b/pkgs/applications/video/makemkv/default.nix
+@@ -14,21 +14,21 @@
+ }:
+ 
+ let
+-  version = "1.16.7";
++  version = "1.17.1";
+   # Using two URLs as the first one will break as soon as a new version is released
+   src_bin = fetchurl {
+     urls = [
+       "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
+       "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
+     ];
+-    sha256 = "sha256-YjsYW2MmzDZqOMdYlqE0dZ399Qq8hJRQ9BCViNexLHs=";
++    sha256 = "sha256-B4SQiwf5/Icweg+VgQW34tN/XxDA7xoSgIVOfXwGsfM=";
+   };
+   src_oss = fetchurl {
+     urls = [
+       "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
+       "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
+     ];
+-    sha256 = "sha256-TL0PRP/pDg16qsbYi9RYyD0egNDaxuApmR86hiR/Rq8=";
++    sha256 = "sha256-DVcrG5N9lydct11xoUKz1VVCiuvVOmQWGlAP2nrnZv4=";
+   };
+ 
+ in mkDerivation {
diff --git a/nixpatches/list.nix b/nixpatches/list.nix
index 43f7bad8c..fa6c16317 100644
--- a/nixpatches/list.nix
+++ b/nixpatches/list.nix
@@ -20,4 +20,6 @@ fetchpatch: [
   ./07-duplicity-rich-url.patch
   # TODO: upstream
   ./08-zecwallet-lite.patch
+  # upstream PR: https://github.com/NixOS/nixpkgs/pull/188342
+  ./09-makemkv-1.17.1.patch
 ]