diff --git a/susemanager/bin/mgr-setup b/susemanager/bin/mgr-setup
index bf0e49e121cd..ab11aacba1a5 100755
--- a/susemanager/bin/mgr-setup
+++ b/susemanager/bin/mgr-setup
@@ -411,6 +411,17 @@ fi
 setup_apache() {
     sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES wsgi
 }
+
+setup_cobbler() {
+    if [ -f "/etc/cobbler/settings" ]; then
+        if ! grep "tftpsync_timeout:" /etc/cobbler/settings >/dev/null; then
+            echo "" >> /etc/cobbler/settings
+            echo "tftpsync_timeout: 15" >> /etc/cobbler/settings
+            echo "" >> /etc/cobbler/settings
+        fi
+    fi
+}
+
 setup_spacewalk() {
     CERT_COUNTRY=`echo -n $CERT_COUNTRY|tr '[:lower:]' '[:upper:]'`
 
@@ -912,6 +923,8 @@ do_setup() {
     setup_spacewalk
 
     setup_apache
+    
+    setup_cobbler
 
     # In the container case, we have the MIRROR_PATH environment variable at setup
     if [ -n "$MIRROR_PATH" ]; then
diff --git a/tftpsync/susemanager-tftpsync/susemanager-tftpsync.spec b/tftpsync/susemanager-tftpsync/susemanager-tftpsync.spec
index ccd3ee2a885d..c80f508aeb11 100644
--- a/tftpsync/susemanager-tftpsync/susemanager-tftpsync.spec
+++ b/tftpsync/susemanager-tftpsync/susemanager-tftpsync.spec
@@ -78,15 +78,6 @@ install -p -D -m 755 configure-tftpsync.sh  %{buildroot}%{_sbindir}/configure-tf
 %endif
 %endif
 
-%post
-if [ -f "/etc/cobbler/settings" ]; then
-  if ! grep "tftpsync_timeout:" /etc/cobbler/settings >/dev/null; then
-    echo "" >> /etc/cobbler/settings
-    echo "tftpsync_timeout: 15" >> /etc/cobbler/settings
-    echo "" >> /etc/cobbler/settings
-  fi
-fi
-
 %files
 %defattr(-,root,root,-)
 %doc COPYING.LIB README