diff --git a/pkgs/by-name/fr/frescobaldi/package.nix b/pkgs/by-name/fr/frescobaldi/package.nix
index 53548207c462..4f8cbd308c0a 100644
--- a/pkgs/by-name/fr/frescobaldi/package.nix
+++ b/pkgs/by-name/fr/frescobaldi/package.nix
@@ -4,38 +4,37 @@
   fetchFromGitHub,
   python3Packages,
   lilypond,
+  qt6,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "frescobaldi";
-  version = "3.3.0";
-  format = "setuptools";
+  version = "4.0.4";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "wbsoft";
     repo = "frescobaldi";
     tag = "v${version}";
-    sha256 = "sha256-Q6ruthNcpjLlYydUetkuTECiCIzu055bw40O8BPGq/A=";
+    hash = "sha256-J0QC+VwNdA24vAW5Fx+cz5IFajkB8GmR4Rae0Q+2zw8=";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  dependencies = with python3Packages; [
     qpageview
     lilypond
-    pygame
+    pygame-ce
+    pyqt6-sip
     python-ly
-    sip4
-    pyqt5
-    poppler-qt5
-    pyqtwebengine
+    pyqt6
+    pyqt6-webengine
   ];
 
-  nativeBuildInputs = [ python3Packages.pyqtwebengine.wrapQtAppsHook ];
+  buildInputs = [ qt6.qtbase ];
+  nativeBuildInputs = [ qt6.wrapQtAppsHook ];
 
-  # Needed because source is fetched from git
-  preBuild = ''
-    make -C i18n
-    make -C linux
-  '';
+  build-system = with python3Packages; [
+    hatchling
+  ];
 
   # no tests in shipped with upstream
   doCheck = false;
diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix
index b6168ae165d5..5d6bd6d8337e 100644
--- a/pkgs/development/python-modules/pyqt/6.x.nix
+++ b/pkgs/development/python-modules/pyqt/6.x.nix
@@ -21,6 +21,7 @@
   withSerialPort ? false,
   cups,
   withSpeech ? true,
+  withPdf ? true,
 }:
 
 buildPythonPackage rec {
@@ -104,7 +105,8 @@ buildPythonPackage rec {
     ++ lib.optional withWebSockets qtwebsockets
     ++ lib.optional withLocation qtlocation
     ++ lib.optional withSerialPort qtserialport
-    ++ lib.optional withSpeech qtspeech;
+    ++ lib.optional withSpeech qtspeech
+    ++ lib.optional withPdf qtwebengine;
 
   buildInputs =
     with qt6Packages;
@@ -121,7 +123,8 @@ buildPythonPackage rec {
     ++ lib.optional withWebSockets qtwebsockets
     ++ lib.optional withLocation qtlocation
     ++ lib.optional withSerialPort qtserialport
-    ++ lib.optional withSpeech qtspeech;
+    ++ lib.optional withSpeech qtspeech
+    ++ lib.optional withPdf qtwebengine;
 
   propagatedBuildInputs =
     # ld: library not found for -lcups
@@ -151,7 +154,8 @@ buildPythonPackage rec {
   # ++ lib.optional withConnectivity "PyQt6.QtConnectivity"
   ++ lib.optional withLocation "PyQt6.QtPositioning"
   ++ lib.optional withSerialPort "PyQt6.QtSerialPort"
-  ++ lib.optional withSpeech "PyQt6.QtTextToSpeech";
+  ++ lib.optional withSpeech "PyQt6.QtTextToSpeech"
+  ++ lib.optional withPdf "PyQt6.QtPdf";
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-address-of-temporary";
 
diff --git a/pkgs/development/python-modules/qpageview/default.nix b/pkgs/development/python-modules/qpageview/default.nix
index a62b0bedbd0b..238c489ca28d 100644
--- a/pkgs/development/python-modules/qpageview/default.nix
+++ b/pkgs/development/python-modules/qpageview/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   hatchling,
   pyqt6,
-  poppler-qt5,
   pycups,
 }:
 
@@ -24,7 +23,6 @@ buildPythonPackage rec {
 
   dependencies = [
     pyqt6
-    poppler-qt5
     pycups
   ];
 
@@ -33,7 +31,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "qpageview" ];
 
   meta = {
-    description = "Page-based viewer widget for Qt5/PyQt5";
+    description = "Page-based viewer widget for Qt6/PyQt6";
     homepage = "https://github.com/frescobaldi/qpageview";
     changelog = "https://github.com/frescobaldi/qpageview/blob/${src.tag}/ChangeLog";
     license = lib.licenses.gpl3Only;