diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 26548e26998..ee292a431d8 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -29,6 +29,7 @@
 ;;; Copyright © 2025 Lars Bilke <lars.bilke@ufz.de>
 ;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2025 Nguyễn Gia Phong <mcsinyx@disroot.org>
+;;; Copyright © 2025 Brice Waegeneire <brice@waegenei.re>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3702,15 +3703,16 @@ SET\\(PYQT5_SIP_DIR \"\\$\\{Python_SITEARCH\\}/PyQt5/bindings\"\\)")
            python-dateutil
            python-future
            python-jinja2
+           python-lxml
            python-numpy
            python-owslib
            python-psycopg2
            python-pygments
-           python-pyqt+qscintilla
+           python-pyqt+qscintilla-with-python-sip-6.8
            python-pytz
            python-pyyaml
            python-requests
-           python-sip
+           python-sip-6.8
            python-six
            python-urllib3
            qca
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index bba324f258f..0181ed10b0d 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -35,6 +35,7 @@
 ;;; Copyright © 2024 Josep Bigorra <jjbigorra@gmail.com>
 ;;; Copyright © 2025 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2024 Sughosha <sughosha@disroot.org>
+;;; Copyright © 2025 Brice Waegeneire <brice@waegenei.re>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4075,6 +4076,27 @@ module provides support functions to the automatically generated code.")
     ;; For compatibility with pyqt, we need gpl3.
     (license license:gpl3)))
 
+;; FIXME Remove this package when not needed by qgis anymore
+;; This is a stopgap to build qgis@3.42.1 while waiting for the
+;; qt-team branch to be merged in master with python-pyqt5-sip@12.17.0.
+(define-public python-sip-6.8
+  (hidden-package
+   (package
+     (inherit python-sip)
+     (name "python-sip")
+     (version "6.8.6")
+     (source
+      (origin
+        (method url-fetch)
+        (uri (list (pypi-uri "sip" version)
+                   (string-append "https://www.riverbankcomputing.com/static/"
+                                  "Downloads/sip/" version
+                                  "/sip-" version ".tar.gz")))
+        (sha256
+         (base32
+          "0ykxq0607f2sdwbl5cxbp0y8pl14bsgzc9nhifpxbibfivj5kjbz"))
+        (patches (search-patches "python-sip-include-dirs.patch")))))))
+
 (define-public python-sip-4
   (package
     (inherit python-sip)
@@ -4546,6 +4568,16 @@ This package provides the Python bindings.")))
     (description
      "This package contains the union of PyQt and the Qscintilla extension.")))
 
+;; FIXME Remove this procedure and its related package when qgis won't need them
+;; anymore
+(define python-sip-6.8-instead-of-python-sip
+  (package-input-rewriting `((,python-sip . ,python-sip-6.8))
+                           #:deep? #t))
+
+(define-public python-pyqt+qscintilla-with-python-sip-6.8
+  (hidden-package
+   (python-sip-6.8-instead-of-python-sip python-pyqt+qscintilla)))
+
 (define-public qtimgui
   (let ((commit "48d64a715b75dee24e398f7e5b0942c2ca329334")
         (revision "0"))