diff --git a/gnu/system.scm b/gnu/system.scm
index b14991e5db..fc8b57fe06 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -336,6 +336,11 @@ (define %base-packages
          net-tools                        ; XXX: remove when Inetutils suffices
          man-db
 
+         ;; The 'sudo' command is already in %SETUID-PROGRAMS, but we also
+         ;; want the other commands and the man pages (notably because
+         ;; auto-completion in Emacs shell relies on man pages.)
+         sudo
+
          ;; Get 'insmod' & co. from kmod, not module-init-tools, since udev
          ;; already depends on it anyway.
          kmod eudev