diff --git a/susemanager/bin/mgr-setup b/susemanager/bin/mgr-setup
index 9b555254b168..797a0dc45706 100755
--- a/susemanager/bin/mgr-setup
+++ b/susemanager/bin/mgr-setup
@@ -172,25 +172,10 @@ fi
 }
 
 setup_mail () {
-
-# fix hostname for postfix
-REALHOSTNAME=`hostname -f`
-if [ -z "$REALHOSTNAME" ]; then
-        for i in `ip -f inet -o addr show scope global | awk '{print $4}' | awk -F \/ '{print $1}'`; do
-                for j in `dig +noall +answer +time=2 +tries=1 -x $i | awk '{print $5}' | sed 's/\.$//'`; do
-                        if [ -n "$j" ]; then
-                                REALHOSTNAME=$j
-                                break 2
-                        fi
-                done
-        done
-fi
-if [ -n "$REALHOSTNAME" ]; then
-        echo "$REALHOSTNAME" > /etc/hostname
-fi
-# bsc#979664 - SUSE Manager requires a working mail system
-systemctl --quiet enable postfix 2>&1
-systemctl restart postfix
+    postconf -e myhostname=$HOSTNAME
+    # bsc#979664 - SUSE Manager requires a working mail system
+    systemctl --quiet enable postfix 2>&1
+    systemctl restart postfix
 }
 
 setup_hostname() {
diff --git a/susemanager/susemanager.changes.mbussolotto.postfix b/susemanager/susemanager.changes.mbussolotto.postfix
new file mode 100644
index 000000000000..76abe2b83535
--- /dev/null
+++ b/susemanager/susemanager.changes.mbussolotto.postfix
@@ -0,0 +1 @@
+- setup postfix hostname using conf file