diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index c63f834423..57a15602d3 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -555,6 +555,7 @@ avoiding password prompts when X11 forwarding has already been setup.")
               (sha256
                (base32
                 "0awwz5pg9x5bj0d7dpg4a7bd4gl6k55mlpxwb12534fkrpn19p0f"))))
+    (outputs '("out" "doc"))
     (build-system meson-build-system)
     (inputs
      (list libx11
@@ -572,13 +573,22 @@ avoiding password prompts when X11 forwarding has already been setup.")
          (list pkg-config-for-build)
          '())))
     (arguments
-     (list #:configure-flags
-           #~(list (string-append "-Dxkb-config-root="
-                                  (search-input-directory
-                                   %build-inputs "share/X11/xkb"))
-                   (string-append "-Dx-locale-root="
-                                  (search-input-directory
-                                   %build-inputs "share/X11/locale")))))
+     (list
+      #:configure-flags
+      #~(list (string-append "-Dxkb-config-root="
+                             (search-input-directory
+                              %build-inputs "share/X11/xkb"))
+              (string-append "-Dx-locale-root="
+                             (search-input-directory
+                              %build-inputs "share/X11/locale")))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'move-doc
+            (lambda _
+              (let ((old (string-append #$output "/share/doc"))
+                    (new (string-append #$output:doc "/share/doc")))
+                (mkdir-p (dirname new))
+                (rename-file old new)))))))
     (home-page "https://xkbcommon.org/")
     (synopsis "Library to handle keyboard descriptions")
     (description "Xkbcommon is a library to handle keyboard descriptions,