diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index cf21ca7ff34a..c98f2d401219 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -56,11 +56,6 @@ push @skip, Spacewalk::Setup::EMBEDDED_DB_ANSWERS
 Spacewalk::Setup::load_answer_file(\%opts, \%answers, \@skip);
 my $product_name = $answers{'product_name'} || 'Spacewalk';
 
-my $hn = `/bin/hostname -f`;
-chomp($hn);
-$hn = Sys::Hostname::hostname if(!defined $hn || $hn eq "");
-$answers{hostname} ||= "$hn";
-
 if (not $opts{"skip-fqdn-test"} and
     not (lc($answers{hostname}) eq $answers{hostname})) {
     print Spacewalk::Setup::loc(
diff --git a/spacewalk/setup/spacewalk-setup.changes.cbosdo.setup-cleanup b/spacewalk/setup/spacewalk-setup.changes.cbosdo.setup-cleanup
new file mode 100644
index 000000000000..c508ffaaeafb
--- /dev/null
+++ b/spacewalk/setup/spacewalk-setup.changes.cbosdo.setup-cleanup
@@ -0,0 +1 @@
+- Remove now unneeded hostname calls (bsc#1231255)
diff --git a/susemanager/bin/mgr-setup b/susemanager/bin/mgr-setup
index 8c8be79b312f..30877751afaa 100755
--- a/susemanager/bin/mgr-setup
+++ b/susemanager/bin/mgr-setup
@@ -277,8 +277,7 @@ scc-pass = $SCC_PASS
     /usr/bin/spacewalk-setup --non-interactive --clear-db $PARAM_CC --answer-file=/root/spacewalk-answers $PARAM_DB
     SWRET=$?
     if [ "x" = "x$MANAGER_MAIL_FROM" ]; then
-        MY_DOMAIN=`hostname -d`
-        MANAGER_MAIL_FROM="$PRODUCT_NAME ($REALHOSTNAME) <root@$MY_DOMAIN>"
+        MANAGER_MAIL_FROM="$PRODUCT_NAME ($HOSTNAME) <root@$HOSTNAME>"
     fi
     if ! grep "^web.default_mail_from" /etc/rhn/rhn.conf > /dev/null; then
         echo "web.default_mail_from = $MANAGER_MAIL_FROM" >> /etc/rhn/rhn.conf
diff --git a/susemanager/susemanager.changes.cbosdo.setup-cleanup b/susemanager/susemanager.changes.cbosdo.setup-cleanup
index a045ed45db0b..5118c2472444 100644
--- a/susemanager/susemanager.changes.cbosdo.setup-cleanup
+++ b/susemanager/susemanager.changes.cbosdo.setup-cleanup
@@ -1 +1,2 @@
 - Cleanup the setup script (bsc#1231255)
+- Remove now unneeded hostname calls (bsc#1231255)