diff --git a/.linux_items/include/airootfs/etc/skel/.update_hostname b/.linux_items/include/airootfs/etc/skel/.update_hostname
new file mode 100755
index 00000000..da563ab6
--- /dev/null
+++ b/.linux_items/include/airootfs/etc/skel/.update_hostname
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+IP="$(ip a show scope global \
+  | grep inet \
+  | head -1 \
+  | sed -r 's#.*inet ([0-9]+.[0-9]+.[0-9]+.[0-9]+.)/.*#\1#')"
+HOSTNAME="$(dig +noall +answer +short -x "$IP" \
+  | sed 's/\.$//')"
+
+# Set hostname and renew DHCP lease
+sudo hostnamectl set-hostname "${HOSTNAME}"
+sudo dhclient -r
+sleep 1
+sudo dhclient
+
diff --git a/.linux_items/include/airootfs/etc/skel/.xinitrc b/.linux_items/include/airootfs/etc/skel/.xinitrc
index 2827fe58..573aed1d 100755
--- a/.linux_items/include/airootfs/etc/skel/.xinitrc
+++ b/.linux_items/include/airootfs/etc/skel/.xinitrc
@@ -12,6 +12,7 @@ conky -d
 nm-applet &
 cbatticon &
 volumeicon &
+$HOME/.update_hostname
 connect-to-network &
 (sleep 5s && killall dunst) &
 $HOME/.urxvt_default_res &