diff --git a/gnu/installer.scm b/gnu/installer.scm
index 1b9aeaa217..7e023ce18f 100644
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -278,6 +278,7 @@ (define installer-builder
                          (gnu installer keymap)
                          (gnu installer steps)
                          (gnu installer final)
+                         (gnu installer hostname)
                          (gnu installer locale)
                          (gnu installer parted)
                          (gnu installer services)
diff --git a/gnu/installer/hostname.scm b/gnu/installer/hostname.scm
new file mode 100644
index 0000000000..b8e823d0a8
--- /dev/null
+++ b/gnu/installer/hostname.scm
@@ -0,0 +1,23 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu installer hostname)
+  #:export (hostname->configuration))
+
+(define (hostname->configuration hostname)
+  `((host-name ,hostname)))
diff --git a/gnu/local.mk b/gnu/local.mk
index 15a43406a4..bcb5e5f679 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -570,6 +570,7 @@ GNU_SYSTEM_MODULES +=                           \
   %D%/installer/record.scm		        \
   %D%/installer/connman.scm			\
   %D%/installer/final.scm			\
+  %D%/installer/hostname.scm			\
   %D%/installer/keymap.scm			\
   %D%/installer/locale.scm			\
   %D%/installer/newt.scm			\
diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in
index 16d9c9e4ae..df7459a4b7 100644
--- a/po/guix/POTFILES.in
+++ b/po/guix/POTFILES.in
@@ -11,6 +11,7 @@ guix/import/opam.scm
 gnu/installer.scm
 gnu/installer/record.scm
 gnu/installer/connman.scm
+gnu/installer/hostname.scm
 gnu/installer/keymap.scm
 gnu/installer/locale.scm
 gnu/installer/newt.scm