diff --git a/susemanager/bin/mgr-setup b/susemanager/bin/mgr-setup
index 676624203f00..359e3ed9c694 100755
--- a/susemanager/bin/mgr-setup
+++ b/susemanager/bin/mgr-setup
@@ -414,7 +414,6 @@ fi
 # goal would be to move everything here.
 #
 setup_apache() {
-
     sed -i 's|DocumentRoot "/srv|DocumentRoot "/usr/share/susemanager|g' /etc/apache2/default-server.conf
     sed -i 's|<Directory "/srv|<Directory "/usr/share/susemanager|g' /etc/apache2/default-server.conf
     sed -i 's|<Directory "/srv|<Directory "/usr/share/susemanager|g' /etc/apache2/conf.d/zz-spacewalk-www.conf
@@ -423,6 +422,15 @@ setup_apache() {
     sed -i 's|DocumentRoot "/srv|DocumentRoot "/usr/share/susemanager|g' /etc/apache2/vhosts.d/vhost-ssl.template
 }
 
+#TODO move this on the permission check function
+setup_permission() {
+    mkdir -p /srv/susemanager/salt/tmp
+    mkdir -p /srv/susemanager/salt/custom
+    chown tomcat:susemanager -R /srv/susemanager/salt/tmp
+    chown tomcat:susemanager -R /srv/susemanager/salt/custom
+    chmod 775 -R /srv/susemanager/salt/tmp
+    chmod 775 -R /srv/susemanager/salt/custom
+}
 
 setup_spacewalk() {
     CERT_COUNTRY=`echo -n $CERT_COUNTRY|tr '[:lower:]' '[:upper:]'`
@@ -524,6 +532,8 @@ ssl-server-key = $SERVER_KEY" >> /root/spacewalk-answers
 
     setup_apache
 
+    setup_permission
+
     # rm /root/spacewalk-answers
     if [ "$SWRET" != "0" ]; then
         echo "ERROR: spacewalk-setup failed" >&2