diff --git a/package/base/stone/stone_mod_setup.sh b/package/base/stone/stone_mod_setup.sh
index eee7ad869..9d061a039 100644
--- a/package/base/stone/stone_mod_setup.sh
+++ b/package/base/stone/stone_mod_setup.sh
@@ -74,6 +74,12 @@ EOT
 	rm -f $tmp1 $tmp2
 }
 
+set_hostname() {
+	gui_input "Set a hostname (without domain part)" "localhost" hn
+	echo "$hn" > /etc/HOSTNAME
+	hostname "$hn"
+}
+
 set_rootpw() {
 	if [ "$SETUPG" = dialog ] ; then
 		tmp1="`mktemp`" ; tmp2="`mktemp`" ; rc=0
@@ -102,6 +108,7 @@ main() {
 
 	make_fstab
 	$STONE general set_keymap
+	set_hostname
 	while ! set_rootpw; do :; done
 	$STONE general set_tmarea
 	$STONE general set_dtime