diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix
new file mode 100644
index 000000000000..02e23084cf53
--- /dev/null
+++ b/pkgs/applications/audio/tageditor/default.nix
@@ -0,0 +1,58 @@
+{ stdenv
+, pkgs
+, fetchFromGitHub
+, pkg-config
+, cmake
+
+, cpp-utilities
+, qtutilities
+, mp4v2
+, libid3tag
+, qtbase
+, qttools
+, qtwebengine
+, qtx11extras
+, tagparser
+, wrapQtAppsHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tageditor";
+  version = "3.3.10";
+
+  src = fetchFromGitHub {
+    owner = "martchus";
+    repo = "tageditor";
+    rev = "v${version}";
+    sha256 = "16cmq7dyalcwc8gx1y9acngw5imjh8ydp4prxy7qpzk4fj3kpsak";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    wrapQtAppsHook
+  ];
+  buildInputs = [
+    mp4v2
+    libid3tag
+    pkg-config
+    qtbase
+    qttools
+    qtx11extras
+    qtwebengine
+    cpp-utilities
+    qtutilities
+    tagparser
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with pkgs.lib; {
+    homepage = "https://github.com/Martchus/tageditor";
+    description = "A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.matthiasbeyer ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/development/libraries/tagparser/default.nix b/pkgs/development/libraries/tagparser/default.nix
new file mode 100644
index 000000000000..deeb7552069f
--- /dev/null
+++ b/pkgs/development/libraries/tagparser/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, pkgs
+, fetchFromGitHub
+, cmake
+, cpp-utilities
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+  pname = "tagparser";
+  version = "9.4.0";
+
+  src = fetchFromGitHub {
+    owner = "Martchus";
+    repo = "tagparser";
+    rev = "v${version}";
+    sha256 = "097dq9di19d3mvnlrav3fm78gzjni5babswyv10xnrxfhnf14f6x";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [
+    cpp-utilities zlib
+  ];
+
+  meta = with pkgs.lib; {
+    homepage = "https://github.com/Martchus/tagparser";
+    description = "C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.matthiasbeyer ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6df1b6a4744a..57bb327472fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16821,6 +16821,8 @@ in
     inherit (darwin.apple_sdk.frameworks) Carbon;
   };
 
+  tageditor = libsForQt5.callPackage ../applications/audio/tageditor { };
+
   taglib = callPackage ../development/libraries/taglib { };
 
   taglib_extras = callPackage ../development/libraries/taglib-extras { };
@@ -16829,6 +16831,8 @@ in
 
   talloc = callPackage ../development/libraries/talloc { };
 
+  tagparser = callPackage ../development/libraries/tagparser { };
+
   tclap = callPackage ../development/libraries/tclap {};
 
   tcllib = callPackage ../development/libraries/tcllib { };