diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index c7b1d695041..0c6dc9219c4 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -74,13 +74,13 @@ let
 
 in pythonPackages.buildPythonApplication rec {
   name = "beets-${version}";
-  version = "1.3.19";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
-    owner = "sampsyo";
+    owner = "beetbox";
     repo = "beets";
     rev = "v${version}";
-    sha256 = "0f2v1924ryx5xijpv1jycanl4471vcd7c5lld58lm0viyvh5k28x";
+    sha256 = "1yj2m7l157lldhxanwifp3yv1c6k649iwhn061mcf26q4n8qmspk";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/tools/audio/beets/keyfinder-default-bin.patch b/pkgs/tools/audio/beets/keyfinder-default-bin.patch
index b0b573bbf31..1ea195a678e 100644
--- a/pkgs/tools/audio/beets/keyfinder-default-bin.patch
+++ b/pkgs/tools/audio/beets/keyfinder-default-bin.patch
@@ -1,5 +1,5 @@
 diff --git a/beetsplug/keyfinder.py b/beetsplug/keyfinder.py
-index b6131a4..b493792 100644
+index 34a4abc..59e8539 100644
 --- a/beetsplug/keyfinder.py
 +++ b/beetsplug/keyfinder.py
 @@ -30,7 +30,7 @@ class KeyFinderPlugin(BeetsPlugin):
@@ -11,25 +11,26 @@ index b6131a4..b493792 100644
              u'auto': True,
              u'overwrite': False,
          })
-@@ -59,7 +59,7 @@ class KeyFinderPlugin(BeetsPlugin):
+@@ -59,8 +59,7 @@ class KeyFinderPlugin(BeetsPlugin):
                  continue
  
              try:
--                output = util.command_output([bin, b'-f',
-+                output = util.command_output([bin,
-                                               util.syspath(item.path)])
+-                output = util.command_output([bin, '-f',
+-                                              util.syspath(item.path)])
++                output = util.command_output([bin, util.syspath(item.path)])
              except (subprocess.CalledProcessError, OSError) as exc:
                  self._log.error(u'execution failed: {0}', exc)
+                 continue
 diff --git a/test/test_keyfinder.py b/test/test_keyfinder.py
-index 00952fe..01ff8d4 100644
+index 57e2bcd..c1ee916 100644
 --- a/test/test_keyfinder.py
 +++ b/test/test_keyfinder.py
-@@ -46,7 +46,7 @@ class KeyFinderTest(unittest.TestCase, TestHelper):
+@@ -44,7 +44,7 @@ class KeyFinderTest(unittest.TestCase, TestHelper):
          item.load()
          self.assertEqual(item['initial_key'], 'C#m')
-         self.command_output.assert_called_with(
+         command_output.assert_called_with(
 -            ['KeyFinder', '-f', util.syspath(item.path)])
 +            ['keyfinder-cli', util.syspath(item.path)])
  
-     def test_add_key_on_import(self):
-         self.command_output.return_value = 'dbm'
+     def test_add_key_on_import(self, command_output):
+         command_output.return_value = 'dbm'