diff --git a/templates/initscripts/files/rc.conf b/templates/initscripts/files/rc.conf
index e8458a9432a..0c3ffe51c39 100755
--- a/templates/initscripts/files/rc.conf
+++ b/templates/initscripts/files/rc.conf
@@ -23,12 +23,10 @@ KEYMAP="es"
 CONSOLEFONT=
 CONSOLEMAP=
 
-USELVM="no"
-HOSTNAME="xbps"
-
 #
 # Services and daemons.
 #
+hostname="xbps"
 syslogd=yes
 klogd=yes
 
diff --git a/templates/initscripts/files/rc.sysinit b/templates/initscripts/files/rc.sysinit
index 40cebbf2787..e74d1b47492 100755
--- a/templates/initscripts/files/rc.sysinit
+++ b/templates/initscripts/files/rc.sysinit
@@ -50,8 +50,3 @@ fi
 if [ -f /etc/localtime ]; then
 	hwclock $HWCLOCK_PARAMS --noadjfile
 fi
-
-# Set hostname
-if [ -n "$HOSTNAME" ]; then
-	hostname "$HOSTNAME"
-fi