diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index ab148cf4ac..8e082dd8e0 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -429,6 +429,23 @@ AddGroupToHaikuImage root : 0 : ;
 AddGroupToHaikuImage users : 100 : ;
 
 
+#pragma mark - Host Name
+
+
+if $(HAIKU_IMAGE_HOST_NAME) {
+	actions BuildHaikuImageHostnameFile
+	{
+		echo "$(HAIKU_IMAGE_HOST_NAME)" > $(1) 
+	}
+
+	local file = <haiku-image>hostname ;
+	Always $(file) ;
+	MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
+	BuildHaikuImageHostnameFile $(file) ;
+	AddFilesToHaikuImage common settings network : $(file) ;
+}
+
+
 #pragma mark - Build The Image
 
 
diff --git a/build/jam/UserBuildConfig.ReadMe b/build/jam/UserBuildConfig.ReadMe
index a30fddbbdc..bf785d06a7 100644
--- a/build/jam/UserBuildConfig.ReadMe
+++ b/build/jam/UserBuildConfig.ReadMe
@@ -139,6 +139,10 @@ HAIKU_IMAGE_LATE_USER_SCRIPTS	= $(HAIKU_TOP)/../late-image-script.sh ;
 HAIKU_ROOT_USER_NAME = bond  ;
 HAIKU_ROOT_USER_REAL_NAME = "James Bond" ;
 
+# Set host name to "mybox". By default the installation doesn't have a host
+# name.
+HAIKU_IMAGE_HOST_NAME = mybox ;
+
 # Add user "walter" with user ID 1000 and group ID 100 (note, that a group with
 # that ID should exist -- 100 already exists and is the "users" group), home
 # directory "/boot/home", shell "/bin/bash", and real name "Just Walter" to the