diff --git a/meta/recipes-support/customizations/hostname-customization.bb b/meta/recipes-support/customizations/hostname-customization.bb
new file mode 100644
index 00000000..ba37c973
--- /dev/null
+++ b/meta/recipes-support/customizations/hostname-customization.bb
@@ -0,0 +1,11 @@
+inherit dpkg-customization
+
+DESCRIPTION      = "Amend the system hostname"
+LICENSE          = "gpl-2.0"
+LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
+MAINTAINER       = "isar-users <isar-users@googlegroups.com>"
+DEBIAN_DEPENDS   = "netbase"
+PV               = "0.3"
+SRC_URI          = "file://postinst.tmpl"
+TEMPLATE_FILES   = "postinst.tmpl"
+TEMPLATE_VARS    = "HOSTNAME"
diff --git a/meta/recipes-support/customizations/hostname-customization/postinst.tmpl b/meta/recipes-support/customizations/hostname-customization/postinst.tmpl
new file mode 100644
index 00000000..db9475df
--- /dev/null
+++ b/meta/recipes-support/customizations/hostname-customization/postinst.tmpl
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo "${HOSTNAME}" > /etc/hostname
+echo "127.0.1.1	${HOSTNAME}" >> /etc/hosts
+sed -i  -e 's/^127.0.0.1[[:space:]]\+localhost$/& localhost.localdomain/' /etc/hosts