diff --git a/sys-apps/calculate-server/ChangeLog b/sys-apps/calculate-server/ChangeLog
index 14984767e..33672046e 100644
--- a/sys-apps/calculate-server/ChangeLog
+++ b/sys-apps/calculate-server/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*calculate-server-2.1.12-r7 (02 Dec 2010)
+
+  02 Dec 2010; Самоукин Алексей <as@calculate.ru>
+  -calculate-server-2.1.12-r6.ebuild, +calculate-server-2.1.12-r7.ebuild,
+  +files/calculate-server-2.1.12-gen_id.patch:
+  Fix generate replication id.
+
   28 Oct 2010; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
   -calculate-server-2.1.10-r1.ebuild:
   Remove old package.
diff --git a/sys-apps/calculate-server/Manifest b/sys-apps/calculate-server/Manifest
index 1b6061bd7..5d83580bf 100644
--- a/sys-apps/calculate-server/Manifest
+++ b/sys-apps/calculate-server/Manifest
@@ -1,9 +1,10 @@
 AUX calculate-server-2.1.12-fix-remote.patch 1044 RMD160 978802ca4957584de93bc0a58f8627b352a0e7cb SHA1 63f1f873a681760f22a250c7df56cee7871077e1 SHA256 b65cfda3ac32ddefd05261bd5552a796785f35bb89a46ed58c9edcb20db4e81c
 AUX calculate-server-2.1.12-fix-squid.patch 773 RMD160 3395d7cf3fe12c9497ce6d24dd9a7610f0129ada SHA1 3d0b0823c29afac03d6dbc8da4fa96b037a0f27f SHA256 58ae1cc254a31c18f79e82160182138b312fc14955340397f0e2cd66e48dfeee
+AUX calculate-server-2.1.12-gen_id.patch 2261 RMD160 32bdb6d163b303fe43322a80a207cbe51c6da6fe SHA1 6e6b4f1b526dd0279b8aa104f73d770bc78bbf42 SHA256 1bc3513f48dcc4fc6db46962aa98c06c65a9de615a727ce90a35b7e5a6e16068
 AUX calculate-server-2.1.12-r2.patch 1817 RMD160 e2cd6149d0745b7f5859d6d601d3a98a5f5f3f83 SHA1 9ec8885c5d76a0750efd3c09275a2576f71e1213 SHA256 e10c157154d76ed6aa9dfde26a2137a7ee6f9a7d3acf64ba0db2dd14cd2875f5
 AUX server_i18n_path.patch 419 RMD160 46984bb115772b5076ae0b96a5577628d17b2621 SHA1 fe5c64b273946d7b8e60e5a6f2525d9c31224644 SHA256 31693242abc0390492cde326970eb946d212f8295023e70577e0429f378c196d
 DIST calculate-server-2.1.12.tar.bz2 156962 RMD160 beb1d50b72bbb592c666a81504e955a99e4341c4 SHA1 c38413bbf7d257e78888453f5a94ec15071c432b SHA256 c866814d014c5beb84b24febc8491d1d8cbebb6b545b21c4ff601d05b593b36b
-EBUILD calculate-server-2.1.12-r6.ebuild 5366 RMD160 9d4d75fa2bdec868a83467570b9bf7db99eee78b SHA1 26e4e366a115e0e8ac31fb72830170da6e6fa923 SHA256 713954dca81e5597ada630733ea0315e3006e85fdecfb7680ca338cc496fa105
+EBUILD calculate-server-2.1.12-r7.ebuild 5456 RMD160 5b5bf4a9bfb7cc4fed496a5f574668d4fcbf7ba2 SHA1 eb550cc5fa0d058f73b51425899db0b1bd6f7326 SHA256 68dea52805e0ef83d91362cc60be32ed6e8110840267f2619c5a9297bf89144f
 EBUILD calculate-server-9999.ebuild 982 RMD160 870c42d025013fd7f7d0fe8cde686546e3bc2d70 SHA1 90b5183a071503257a8842d2592096e0dc0aa49a SHA256 01b0741043617d45c6ce8089c207684eab1aa7c8610bf3cc33bac1124c67df52
-MISC ChangeLog 4783 RMD160 cc3387d102db9b7fa263a0881e2276952f9f3da7 SHA1 8556e45f7bf49a87fcbf4c8f048e1beffaeeb0fa SHA256 c6d91aaa665c3721de16b0e4613c8967cdd3a38706c4c89d66a34c174ee6781b
+MISC ChangeLog 5044 RMD160 35e0218ed53fe9e13d41794c6b62602094faa33e SHA1 48a20156ca62b145a142603202f9edb672fcf0e6 SHA256 135f68399698887b4f1d4fdef611ced01aebd85e8dbe152b4aeeed5bd0ddc5f5
 MISC metadata.xml 286 RMD160 e243725ec1a1302cab0d0efee76a4a926e855916 SHA1 6071aa604ea5a1ba8e1772e8f37a24f26b893d8d SHA256 aab7ddde310df96da76277d5ae340a4b0926bec3b354bfb2fea3288081036d74
diff --git a/sys-apps/calculate-server/calculate-server-2.1.12-r6.ebuild b/sys-apps/calculate-server/calculate-server-2.1.12-r7.ebuild
similarity index 98%
rename from sys-apps/calculate-server/calculate-server-2.1.12-r6.ebuild
rename to sys-apps/calculate-server/calculate-server-2.1.12-r7.ebuild
index 581ca4f29..24e5e6be2 100644
--- a/sys-apps/calculate-server/calculate-server-2.1.12-r6.ebuild
+++ b/sys-apps/calculate-server/calculate-server-2.1.12-r7.ebuild
@@ -48,6 +48,8 @@ src_unpack() {
 	epatch "${FILESDIR}/calculate-server-2.1.12-fix-remote.patch"
 	# change palce of i18n files to /usr/share/calculate-2.0
 	epatch "${FILESDIR}/server_i18n_path.patch"
+	# fix generate replication id
+	epatch "${FILESDIR}/calculate-server-2.1.12-gen_id.patch"
 }
 
 pkg_postinst() {
diff --git a/sys-apps/calculate-server/files/calculate-server-2.1.12-gen_id.patch b/sys-apps/calculate-server/files/calculate-server-2.1.12-gen_id.patch
new file mode 100644
index 000000000..b5295f320
--- /dev/null
+++ b/sys-apps/calculate-server/files/calculate-server-2.1.12-gen_id.patch
@@ -0,0 +1,53 @@
+diff --git a/pym/cl_fill_server.py b/pym/cl_fill_server.py
+index 87b965e..84eec71 100644
+--- a/pym/cl_fill_server.py
++++ b/pym/cl_fill_server.py
+@@ -230,15 +230,16 @@ class fillVars(object, cl_base.glob_attr):
+         for replServer in replServers:
+             if replServer:
+                 md5hex = hashlib.md5(replServer).hexdigest()
++                data8bit = "".join(map(lambda x: str(int(x,16)/2),list(md5hex)))
+                 dStart = 0
+                 dEnd = 3
+                 dMax = 32
+-                while(dEnd<=dMax and md5hex[dStart:dEnd] in rids):
++                while(dEnd<=dMax and data8bit[dStart:dEnd] in rids):
+                     dStart += 1
+                     dEnd +=1
+                 if dEnd>=dMax:
+                     return ""
+-                rids.append(str(int(md5hex[dStart:dEnd],16)))
++                rids.append(data8bit[dStart:dEnd])
+         return ",".join(rids)
+ 
+     def get_ld_repl_id(self):
+diff --git a/pym/cl_ldap.py b/pym/cl_ldap.py
+index 28d35fc..8aebb09 100644
+--- a/pym/cl_ldap.py
++++ b/pym/cl_ldap.py
+@@ -7289,6 +7289,16 @@ outdated. If the backup is obsolete, use cl-backup."))
+                 return files
+             return True
+ 
++    def updateIDReplServers(self):
++        """Обновление id серверов репликации для LDAP"""
++        if self.clVars.Get("ld_repl_set") == "on":
++            replIds = self.clVars.Get("ld_repl_ids")
++            self.reloadDefaultVar("ld_repl_ids")
++            newReplIds = self.clVars.Get("ld_repl_ids")
++            if replIds != newReplIds:
++                 self.clVars.Write("ld_repl_ids",newReplIds,
++                                   True,"local")
++        return True
+ 
+     def updateServer(self, options, serviceUpdate, clVars=False,
+                      noInputAllowNetServices=[], printReplServ=True):
+@@ -7456,6 +7466,8 @@ outdated. If the backup is obsolete, use cl-backup."))
+         # Флаг почтового релея
+         flagMailRelay = False
+         if not flagError:
++            # Обновление id серверов репликации
++            self.updateIDReplServers()
+             for service in servInstalled:
+                 if service == "ldap":
+                     continue