diff --git a/skel-root/armbox/hd51/etc/init.d/hostname b/archive-imagefiles/scripts/hostname.init
old mode 100755
new mode 100644
similarity index 69%
rename from skel-root/armbox/hd51/etc/init.d/hostname
rename to archive-imagefiles/scripts/hostname.init
index 77805631..8f5d0431
--- a/skel-root/armbox/hd51/etc/init.d/hostname
+++ b/archive-imagefiles/scripts/hostname.init
@@ -5,8 +5,9 @@
 case $1 in
 	start)
 		if [ ! -f /etc/hostname ]; then
+			box_model=$(grep "^box_model=" /.version | cut -d'=' -f2)
 			hwaddr=$(ifconfig eth0 | awk '/HWaddr/ { split($5,v,":"); print v[4] v[5] v[6] }')
-			echo "NI-AX-${hwaddr}" > /etc/hostname
+			echo "${box_model}.NI-${hwaddr}" > /etc/hostname
 		fi
 
 		hostname -F /etc/hostname
diff --git a/make/system-scripts.mk b/make/system-scripts.mk
index ca7d995d..6db4fcb8 100644
--- a/make/system-scripts.mk
+++ b/make/system-scripts.mk
@@ -5,12 +5,16 @@
 
 init-scripts: \
 	init-helpers \
+	init-hostname \
 	init-camd
 
 init-helpers: $(ETCINITD)
 	install -m 0644 $(IMAGEFILES)/scripts/init.globals $(ETCINITD)/globals
 	install -m 0644 $(IMAGEFILES)/scripts/init.functions $(ETCINITD)/functions
 
+init-hostname: $(ETCINITD)
+	install -m 0755 $(IMAGEFILES)/scripts/hostname.init $(ETCINITD)/hostname
+
 init-camd: $(ETCINITD)
 	install -m 0755 $(IMAGEFILES)/scripts/camd.init $(ETCINITD)/camd
 	install -m 0755 $(IMAGEFILES)/scripts/camd_datefix.init $(ETCINITD)/camd_datefix
diff --git a/skel-root/coolstream/hd1/etc/init.d/hostname b/skel-root/coolstream/hd1/etc/init.d/hostname
deleted file mode 100755
index 7946b53a..00000000
--- a/skel-root/coolstream/hd1/etc/init.d/hostname
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-. /etc/init.d/globals
-
-case $1 in
-	start)
-		if [ ! -f /etc/hostname ]; then
-			hwaddr=$(ifconfig eth0 | awk '/HWaddr/ { split($5,v,":"); print v[4] v[5] v[6] }')
-			echo "NI-FLASH-${hwaddr}" > /etc/hostname
-		fi
-
-		hostname -F /etc/hostname
-	;;
-	*)
-		echo "[$BASENAME] Usage: $0 {start}"
-	;;
-esac
diff --git a/skel-root/coolstream/hd2/etc/init.d/hostname b/skel-root/coolstream/hd2/etc/init.d/hostname
deleted file mode 100755
index 7946b53a..00000000
--- a/skel-root/coolstream/hd2/etc/init.d/hostname
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-. /etc/init.d/globals
-
-case $1 in
-	start)
-		if [ ! -f /etc/hostname ]; then
-			hwaddr=$(ifconfig eth0 | awk '/HWaddr/ { split($5,v,":"); print v[4] v[5] v[6] }')
-			echo "NI-FLASH-${hwaddr}" > /etc/hostname
-		fi
-
-		hostname -F /etc/hostname
-	;;
-	*)
-		echo "[$BASENAME] Usage: $0 {start}"
-	;;
-esac