diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 932415440..d4da5d709 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5842,17 +5842,20 @@ basic eye-candy effects.")
        #:configure-flags '("--with-tests"
                            "--with-bundle_tests"
                            "--without-strict")
-        #:modules ((guix build python-build-system) (guix build utils))
-        #:phases (modify-phases %standard-phases
+       #:modules ((guix build python-build-system)
+                  (guix build utils))
+
+       #:phases
+       (modify-phases %standard-phases
          (delete 'build)
          (delete 'check) ;; There's no test suite at the moment.
-          ;; Remove BUILD_CPU, BUILD_DATE, BUILD_TIME
-          ;; from build info to prevent deterministic issues.
-          ;; Also correct some directories and use the xvfb
-          ;; binary instead of xorg-server (which doesn't seem
-          ;; to work).
-          (add-before 'install 'fix-output
-            (lambda _
+
+         ;; Remove BUILD_CPU, BUILD_DATE, BUILD_TIME from build info to
+         ;; prevent deterministic issues.  Also correct some directories and
+         ;; use the xvfb binary instead of xorg-server (which doesn't seem to
+         ;; work).
+         (add-before 'install 'remove-timestamps&set-file-names
+           (lambda* (#:key inputs outputs #:allow-other-keys)
              (substitute* "add_build_info.py"
                ((".*\"BUILD_CPU\", get_cpuinfo.*") ""))
              (substitute* "add_build_info.py"
@@ -5860,16 +5863,28 @@ basic eye-candy effects.")
              (substitute* "add_build_info.py"
                ((".*\"BUILD_TIME\", datetime.*") ""))
              (substitute* "setup.py"
-                (("/etc/init.d/") (string-append %output "/etc/init.d/")))
+               (("/etc/init.d/")
+                (string-append (assoc-ref outputs "out")
+                               "/etc/init.d/")))
              (substitute* "setup.py"
-                (("/usr/lib/") (string-append %output "/lib/")))
+               (("/usr/lib/")
+                (string-append (assoc-ref outputs "out") "/lib/")))
              (substitute* "./etc/xpra/conf.d/55_server_x11.conf.in"
-                           (("xvfb = %.*") (string-append "xvfb = " (assoc-ref
-%build-inputs "xorg-server") "/bin/Xvfb +extension Composite -nolisten tcp"
-" -noreset -auth $XAUTHORITY -screen 0 5760x2560x24+32"))))))))
+               (("xvfb = %.*")
+                (string-append "xvfb = "
+                               (assoc-ref inputs "xorg-server")
+                               "/bin/Xvfb +extension Composite -nolisten tcp"
+                               " -noreset -auth $XAUTHORITY"
+                               " -screen 0 5760x2560x24+32")))
+             #t)))))
     (home-page "https://www.xpra.org/")
     (synopsis "Remote access to individual applications or full desktops")
     (description "Xpra is a persistent remote display server and client for
-forwarding applications and desktop screens.")
+forwarding applications and desktop screens.  It gives you remote access to
+individual applications or full desktops.  On X11, it is also known as
+``@command{screen} for X11'': it allows you to run programs, usually on a
+remote host, direct their display to your local machine, and then to
+disconnect from these programs and reconnect from the same or another machine,
+without losing any state.  It can also be used to forward full desktops from
+X11 servers, Windows, or macOS.")
     (license license:gpl2+)))
-