diff --git a/drydocker/generic_integration.sh b/drydocker/generic_integration.sh
index 3da9c53..61f4d7f 100644
--- a/drydocker/generic_integration.sh
+++ b/drydocker/generic_integration.sh
@@ -1,37 +1,54 @@
 #!/bin/bash
 
-function generic_integration_setup {
+set -x
+
+function generic_integration_install {
     retval=0
 
     max_tries=10
     try_retval=1
 
     while [ ${try_retval} -ne 0 -a ${max_tries} -gt 0 ]; do
         try_retval=$(_shell yum -y install kolab)
 
         if [ ${try_retval} -eq 0 ]; then
             max_tries=0
             retval=0
+            break
         else
             echo "WARNING: Could not install kolab, sleeping for 10 seconds." >&3
             let max_tries--
             retval=${try_retval}
         fi
 
         sleep 10
 
     done
 
     if [ ${retval} -ne 0 ]; then
         return ${retval}
     fi
+}
+
+function generic_integration_setup {
+    if [ ! -x "$(which setup-kolab 2>/dev/null)" ]; then
+        retval=$(_shell generic_integration_install)
+
+        if [ ${retval} -ne 0 ]; then
+            return ${retval}
+        fi
+    fi
+
+    if [ "$(find /etc/dirsrv/slapd-*/ -type f 2>/dev/null | wc -l)" -ne 0 ]; then
+        echo "Kolab Groupware already set up?"
+    fi
 
     retval=$(_shell setup-kolab \
             --default \
             --mysqlserver=new \
             --timezone=Europe/Zurich \
             --directory-manager-pwd=Welcome2KolabSystems
         )
 
     return ${retval}
 }