--- debian/univention-ldap-server.univention-config-registry	(Revision 51045)
+++ debian/univention-ldap-server.univention-config-registry	(Revision 51057)
@@ -51,6 +51,7 @@ 
 Type: subfile
 Multifile: etc/ldap/slapd.conf
 Subfile: etc/ldap/slapd.conf.d/40univention-ldap-server_database
+Variables: ldap/limits
 Variables: ldap/server/type
 Variables: ldap/master
 Variables: ldap/master/port
--- debian/univention-ldap-server.univention-config-registry-variables	(Revision 51045)
+++ debian/univention-ldap-server.univention-config-registry-variables	(Revision 51057)
@@ -167,3 +167,9 @@ 
 Description[en]=This variable configures the frequency for checkpointing the database transaction log upon updating the database. Changes are only needed in exceptional cases and should be tested carefully. The syntax is documented at <http://www.openldap.org/faq/data/cache/1072.html>.
 Type=str
 Categories=service-ldap
+
+[ldap/limits]
+Description[de]=Zeit- oder Größenlimits anhand des Initiators oder der DN definieren.
+Description[en]=Specify time and size limits based on the operation's initiator or base DN.
+Type=str
+Categories=service-ldap
--- debian/univention-ldap-server.postinst	(Revision 51045)
+++ debian/univention-ldap-server.postinst	(Revision 51057)
@@ -99,6 +99,7 @@ 
 								ldap/acl/slavepdc?yes \
 								ldap/acl/nestedgroups?yes \
 								ldap/autostart?yes \
+								ldap/limits?"users time.soft=-1 time.hard=-1" \
 								ldap/maxopenfiles?8192 # Bug #17705
 
 # UDM Property Attributes
--- conffiles/etc/ldap/slapd.conf.d/40univention-ldap-server_database	(Revision 51045)
+++ conffiles/etc/ldap/slapd.conf.d/40univention-ldap-server_database	(Revision 51057)
@@ -79,11 +79,13 @@ 
 					found_attribs.append(attr)
 	if not attribs==[] and not indexes==[]:
 		print 'index\t%s %s'%(','.join(attribs),','.join(indexes))
-@!@
 
-limits users time.soft=-1 time.hard=-1
+print
+for key in configRegistry.get("ldap/limits", "").split(";"):
+	if key:
+		print "limits %s" % key
+print
 
-@!@
 if configRegistry['ldap/server/type'] == "slave":
 	if configRegistry.is_true("ldap/online/master", True):
 		print 'rootdn\t"cn=update,%s"'%configRegistry['ldap/base']