diff --git a/actions/hostname-change b/actions/hostname-change
index 5bf091638..0ae714366 100755
--- a/actions/hostname-change
+++ b/actions/hostname-change
@@ -18,12 +18,15 @@
 
 hostname="$1"
 
-echo "$hostname" > /etc/hostname
-if [ -x /etc/init.d/hostname.sh ] ; then
-    invoke-rc.d hostname.sh start
+if [ -d /run/systemd/system ] ; then
+    hostnamectl set-hostname --transient --static "$hostname"
 else
-    service hostname start
+    echo "$hostname" > /etc/hostname
+    if [ -x /etc/init.d/hostname.sh ] ; then
+	invoke-rc.d hostname.sh start
+    else
+	service hostname start
+    fi
 fi
-hostname "$hostname"
 
 service avahi-daemon restart