--- /usr/share/univention-join/univention-server-join.orig	2012-09-08 07:22:23.000000000 +0200
+++ /usr/share/univention-join/univention-server-join	2012-09-08 07:22:56.000000000 +0200
@@ -357,6 +357,12 @@
 	else
 		create_entry "Client" "computers/mobileclient" "cn=computers,$ldap_base" "cn=Computers,cn=groups,$ldap_base"
 	fi
+elif [ "$ROLE" = "ucc" ]; then
+	if [ -n "$POSITION" ]; then
+		create_entry "Client" "computers/ucc" "$POSITION" "cn=Computers,cn=groups,$ldap_base"
+	else
+		create_entry "Client" "computers/ucc" "cn=computers,$ldap_base" "cn=Computers,cn=groups,$ldap_base"
+	fi
 else
 	log 1 "E: 	-role $ROLE is unknown"
 	exit 1