diff --git a/actions/domainname-change b/actions/domainname-change
index d1d501591..0f4c33e02 100755
--- a/actions/domainname-change
+++ b/actions/domainname-change
@@ -18,10 +18,19 @@
 
 domainname="$1"
 hostname=$(hostname)
-
-if grep -q 127.0.1.1 /etc/hosts ; then
-    sed -i "s/127.0.1.1.*/127.0.1.1       $hostname.$domainname $hostname/" /etc/hosts
+	
+if [ -n "$domainname"] ; then			
+	if grep -q 127.0.1.1 /etc/hosts ; then
+	    sed -i "s/127.0.1.1.*/127.0.1.1       $hostname/" /etc/hosts
+	else
+	    sed -i "/127.0.0.1.*/a \
+	127.0.1.1        $hostname" /etc/hosts
+	fi
 else
-    sed -i "/127.0.0.1.*/a \
-127.0.1.1       $hostname.$domainname $hostname" /etc/hosts
-fi
+	if grep -q 127.0.1.1 /etc/hosts ; then
+	    sed -i "s/127.0.1.1.*/127.0.1.1       $hostname.$domainname $hostname/" /etc/hosts
+	else
+	    sed -i "/127.0.0.1.*/a \
+	127.0.1.1       $hostname.$domainname $hostname" /etc/hosts
+	fi
+fi
\ No newline at end of file