diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 82ccc1fd28..8c371c780b 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -35,7 +35,7 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages python)
   #:use-module (gnu packages sqlite)
-  #:use-module (gnu packages system)
+  #:use-module (gnu packages admin)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages emacs)
   #:use-module (gnu packages compression)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 0b532ae4e2..4d05567a22 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -25,7 +25,7 @@
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages perl)
-  #:use-module (gnu packages system) ; For GNU hostname
+  #:use-module (gnu packages admin) ; For GNU hostname
   #:use-module (gnu packages tcsh))
 
 (define-public vim
diff --git a/gnu/system.scm b/gnu/system.scm
index 0516112553..6fd753f8fd 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -25,7 +25,7 @@
   #:use-module (gnu packages linux-initrd)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
-  #:use-module (gnu packages system)
+  #:use-module (gnu packages admin)
   #:use-module (gnu packages package-management)
   #:use-module (gnu system dmd)
   #:use-module (gnu system grub)
@@ -288,7 +288,7 @@ alias ll='ls -l'
                             (append-map service-pam-services services))))
 
        (bash-file (package-file bash "bin/bash"))
-       (dmd-file  (package-file (@ (gnu packages system) dmd) "bin/dmd"))
+       (dmd-file  (package-file (@ (gnu packages admin) dmd) "bin/dmd"))
        (accounts -> (cons (user-account
                             (name "root")
                             (password "")
diff --git a/gnu/system/dmd.scm b/gnu/system/dmd.scm
index 7cd5f05f78..2143b00426 100644
--- a/gnu/system/dmd.scm
+++ b/gnu/system/dmd.scm
@@ -23,7 +23,7 @@
   #:use-module (guix records)
   #:use-module ((gnu packages base)
                 #:select (glibc-final))
-  #:use-module ((gnu packages system)
+  #:use-module ((gnu packages admin)
                 #:select (mingetty inetutils shadow))
   #:use-module ((gnu packages package-management)
                 #:select (guix))
diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm
index ca24c3df2b..2a85a20ebb 100644
--- a/gnu/system/shadow.scm
+++ b/gnu/system/shadow.scm
@@ -21,7 +21,7 @@
   #:use-module (guix records)
   #:use-module (guix packages)
   #:use-module (guix monads)
-  #:use-module ((gnu packages system)
+  #:use-module ((gnu packages admin)
                 #:select (shadow))
   #:use-module (gnu packages bash)
   #:use-module (srfi srfi-1)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 5932a22b99..e75c09d859 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -39,7 +39,7 @@
   #:use-module (gnu packages package-management)
   #:use-module ((gnu packages make-bootstrap)
                 #:select (%guile-static-stripped))
-  #:use-module (gnu packages system)
+  #:use-module (gnu packages admin)
 
   #:use-module (gnu system shadow)
   #:use-module (gnu system linux)