diff --git a/sys-apps/calculate-server/Manifest b/sys-apps/calculate-server/Manifest
index 7ba1d1c5c..c8f38f0f0 100644
--- a/sys-apps/calculate-server/Manifest
+++ b/sys-apps/calculate-server/Manifest
@@ -1 +1,2 @@
 DIST calculate-server-2.1.19.tar.bz2 172336 BLAKE2B 16e61e248c2fa2cbe3c6fe624392338014f5a5ecdc9b5fd68c9841834365e64b8487b9936236869bbf3ac4cb5f65d663525ace0aa9f42cf4303743c5d9b10b78 SHA512 77d358c8e6882a12e85ba4e6210fb1728e998604ffdd0af37c1ab1324a6520fc610d213fc91185379fd73e9a642bb33ab97ea781474da74b6aa71ae9a849c81b
+DIST calculate-server-2.1.20.tar.bz2 172852 BLAKE2B 4c2078494154722c9442236cee77c4feb13e6a9b229b6ecd0db2c7512710fa771b228dfcdbde598b0f6f7ddc7b289283b5ed92f23d7d19bf6b5f2bd60d5bfd42 SHA512 544aa7018e444c012c231c0961daac2d875c5cbf481366b80154ddf7d7d712e82cbfe06ea64e5d8fd3193949b1d9c6d0cb3d6277800bab9646963f16f46a3ea1
diff --git a/sys-apps/calculate-server/calculate-server-2.1.20.ebuild b/sys-apps/calculate-server/calculate-server-2.1.20.ebuild
new file mode 100644
index 000000000..bb0881804
--- /dev/null
+++ b/sys-apps/calculate-server/calculate-server-2.1.20.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+PYTHON_COMPAT=(python2_7)
+
+DISTUTILS_USE_SETUPTOOLS=manual
+inherit distutils2 eutils
+
+SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/calculate2/${PN}/${P}.tar.bz2
+	http://mirror.yandex.ru/calculate/source/calculate2/${PN}/${P}.tar.bz2"
+
+DESCRIPTION="Configuration utility for Linux services"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="calculate_nomail
+calculate_nodhcp
+calculate_noftp
+calculate_nojabber
+calculate_nonamed
+calculate_nosamba
+calculate_noproxy"
+
+DEPEND="=sys-apps/calculate-lib-2.1.12-r7
+	dev-python/setuptools-python2
+	>=net-nds/openldap-2.3[-minimal]
+	>=sys-auth/pam_ldap-180[ssl]
+	>=sys-auth/nss_ldap-239
+	!<sys-apps/calculate-utils-3.5.0_alpha44
+	!calculate_nosamba? (
+		|| ( 
+			<net-fs/samba-4[acl,client,cups,ldap,netapi,pam,server,smbclient]
+			>=net-fs/samba-4[acl,client,cups,ldap,pam]
+		)
+	)
+	!calculate_nomail? ( 
+		|| ( <net-mail/dovecot-1.2.0[pop3d,ldap,pam,ssl]
+			>=net-mail/dovecot-1.2.0[ldap,pam,ssl(+)]
+		)
+		>=mail-filter/procmail-3.22
+		dev-python/pymilter-python2
+		>=mail-mta/postfix-2.2[ldap,pam,ssl,sasl,dovecot-sasl]
+	)
+	!calculate_noftp? (
+		|| ( <net-ftp/proftpd-1.3.3[-acl,ldap,ncurses,nls,pam,ssl,tcpd]
+			>=net-ftp/proftpd-1.3.3[-acl,ident,ldap,ncurses,nls,pam,ssl,tcpd]
+		)
+	)
+	!calculate_nojabber? (
+		|| ( >=net-im/ejabberd-2.1.8[mod_pubsub,ldap]
+			>=net-im/ejabberd-16.04-r1[ldap] )
+		|| ( media-gfx/imagemagick
+			media-gfx/graphicsmagick )
+	)
+	!calculate_nonamed? ( >=net-dns/bind-9.6.1_p1[sdb-ldap] )
+	!calculate_noproxy? ( >=net-proxy/squid-3.0.14[ldap,pam,ssl] )
+	!calculate_nodhcp? ( >=net-misc/dhcp-3.1.2_p1 )"
+
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	if [ -d /var/calculate/server-data/mail/imap ] || \
+		[ -d /var/calculate/server-data/samba/win/profiles ] || \
+		[ -d /var/calculate/server-data/samba/unix/profiles ] || \
+		[ -d /var/calculate/server-data/samba/win/netlogon ];
+	then
+		ewarn "Data found in directories of previous version calculate-server"
+	fi
+
+	if [ -d /var/calculate/server-data/mail/imap ];
+	then
+		if ! [ -d /var/calculate/server-data/mail~ ];
+		then
+			if mv /var/calculate/server-data/mail/imap \
+				/var/calculate/server-data/mail~ && \
+				rmdir /var/calculate/server-data/mail && \
+				mv /var/calculate/server-data/mail~ \
+					/var/calculate/server-data/mail;
+			then
+				ewarn
+				ewarn "Data from /var/calculate/server-data/mail/imap"
+				ewarn "was moved to /var/calculate/server-data/mail"
+				MAILUPDATE="TRUE"
+			fi
+		fi
+		if ! [ "${MAILUPDATE}" == "TRUE" ];
+		then
+			eerror "Cannot move /var/calculate/server-data/mail/imap"
+			eerror "Please manualy move /var/calculate/server-data/mail/imap"
+			eerror "to /var/calculate/server-data/mail"
+		fi
+	fi
+
+	if [ -d /var/calculate/server-data/samba/win/profiles ];
+	then
+		SAMBAUPDATE=""
+		if ! [ -d /var/calculate/server-data/samba/profiles/win ];
+		then
+			if mkdir -p /var/calculate/server-data/samba/profiles && \
+				mv  /var/calculate/server-data/samba/win/profiles \
+					/var/calculate/server-data/samba/profiles/win;
+			then
+				ewarn
+				ewarn "Data from /var/calculate/server-data/samba/win/profiles"
+				ewarn "was moved to /var/calculate/server-data/samba/profiles/win"
+				SAMBAUPDATE="TRUE"
+			fi
+		fi
+		if ! [ "${SAMBAUPDATE}" == "TRUE" ];
+		then
+			eerror "Cannot move /var/calculate/server-data/samba/win/profiles"
+			eerror "Please manualy move "
+			eerror "/var/calculate/server-data/samba/win/profiles"
+			eerror "to /var/calculate/server-data/samba/profiles/win"
+		fi
+	fi
+
+	if [ -d /var/calculate/server-data/samba/unix/profiles ]; \
+	then
+		SAMBAUPDATE=""
+		if ! [ -d /var/calculate/server-data/samba/profiles/unix ];
+		then
+			if mkdir -p /var/calculate/server-data/samba/profiles && \
+				mv -f /var/calculate/server-data/samba/unix/profiles \
+					/var/calculate/server-data/samba/profiles/unix;
+			then
+				rmdir /var/calculate/server-data/samba/unix
+				ewarn
+				ewarn "Data from /var/calculate/server-data/samba/unix/profiles"
+				ewarn "was moved to /var/calculate/server-data/samba/profiles/unix"
+				SAMBAUPDATE="TRUE"
+			fi
+		fi
+		if ! [ "${SAMBAUPDATE}" == "TRUE" ];
+		then
+			eerror "Cannot move /var/calculate/server-data/samba/unix/profiles"
+			eerror "Please manualy move "
+			eerror "/var/calculate/server-data/samba/unix/profiles"
+			eerror "to /var/calculate/server-data/samba/profiles/unix"
+		fi
+	fi
+
+	if [ -d /var/calculate/server-data/samba/win/netlogon ];
+	then
+		SAMBAUPDATE=""
+		if ! [ -d /var/calculate/server-data/samba/netlogon ];
+		then
+			if mv -f /var/calculate/server-data/samba/win/netlogon \
+				/var/calculate/server-data/samba/netlogon;
+			then
+				rmdir /var/calculate/server-data/samba/win
+				ewarn
+				ewarn "Data form /var/calculate/server-data/samba/win/netlogon"
+				ewarn "was moved to /var/calculate/server-data/samba/netlogon"
+				SAMBAUPDATE="TRUE"
+			fi
+		fi
+		if ! [ "${SAMBAUPDATE}" == "TRUE" ];
+		then
+			eerror "Cannot move /var/calculate/server-data/samba/win/netlogon"
+			eerror "Please manualy move "
+			eerror "/var/calculate/server-data/samba/win/netlogon"
+			eerror "/var/calculate/server-data/samba/netlogon"
+		fi
+	fi
+
+	if [ "${MAILUPDATE}" == "TRUE" ];
+	then
+	    ewarn
+		ewarn "Please update mail service by the command:"
+		ewarn "\tcl-update mail"
+	fi
+	if [ "${SAMBAUPDATE}" == "TRUE" ];
+	then
+	    ewarn
+		ewarn "Please update samba service by the command:"
+		ewarn "\tcl-update samba"
+	fi
+
+	ewarn
+	ewarn "WARNING!!! If you have the samba service, then update it by the command:"
+	ewarn "\tcl-update samba"
+}