diff --git a/media-gfx/calculate-wallpapers/calculate-wallpapers-17-r2.ebuild b/media-gfx/calculate-wallpapers/calculate-wallpapers-17-r2.ebuild
new file mode 100644
index 000000000..8908b60d6
--- /dev/null
+++ b/media-gfx/calculate-wallpapers/calculate-wallpapers-17-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+DESCRIPTION="Wallpapers for Calculate Linux"
+HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/calculate-wallpapers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+VERSION_IUSE="CL11 CL12 CL13 CL14 CL15"
+IUSE="+CL11 +CL12 +CL13 +CL14 +CL15"
+
+SRC_URI="
+	http://mirror.calculate-linux.org/themes/calculate/wallpaper-17-r1.jpg -> ${P}.jpg
+	http://mirror.yandex.ru/calculate/themes/calculate/wallpaper-17-r1.jpg -> ${P}.jpg
+	CL15? (
+		http://mirror.calculate-linux.org/themes/wallpapers/wallpapers-15.tar.bz2
+		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-15.tar.bz2
+	)
+	CL14? (
+		http://mirror.calculate-linux.org/themes/wallpapers/wallpapers-14-r1.tar.bz2
+		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-14-r1.tar.bz2
+	)
+	CL11? (
+		http://mirror.calculate-linux.org/themes/wallpapers/wallpapers-11.tar.bz2
+		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-11.tar.bz2
+	)
+	CL12? (
+		http://mirror.calculate-linux.org/themes/wallpapers/wallpapers-12.tar.bz2
+		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-12.tar.bz2
+	)
+	CL13? (
+		http://mirror.calculate-linux.org/themes/wallpapers/wallpapers-13.tar.bz2
+		http://mirror.yandex.ru/calculate/themes/wallpapers/wallpapers-13.tar.bz2
+	)
+	"
+
+DEPEND="!<sys-apps/calculate-utils-3.5.2.6"
+
+# need for templates
+RDEPEND="${DEPEND}
+	media-gfx/imagemagick"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/themes/Calculate/
+	newins "${DISTDIR}"/${P}.jpg wallpaper.jpg
+
+	insinto /
+	for useflag in $VERSION_IUSE
+	do
+		if use $useflag
+		then
+			cd $WORKDIR/calculate-wallpapers-${useflag//CL}
+			if [[ $useflag == CL14 ]]
+			then
+				mv usr/share/wallpapers/Calculate_Linux usr/share/wallpapers/Calculate_Linux_14
+			fi
+			if [[ $useflag == CL15 ]]
+			then
+				mv usr/share/wallpapers/Calculate_Linux usr/share/wallpapers/Calculate_Linux_15
+			fi
+			doins -r usr
+		fi
+	done
+}
diff --git a/media-gfx/dm-themes-calculate/dm-themes-calculate-17-r3.ebuild b/media-gfx/dm-themes-calculate/dm-themes-calculate-17-r3.ebuild
new file mode 100644
index 000000000..6d6fdc522
--- /dev/null
+++ b/media-gfx/dm-themes-calculate/dm-themes-calculate-17-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+DESCRIPTION="Display manager wallpapers for Calculate Linux"
+HOMEPAGE="http://www.calculate-linux.org/packages/media-gfx/dm-themes-calculate"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+splash +login"
+
+REQUIRED_USE="|| ( splash login )"
+
+SRC_URI="login? ( http://mirror.calculate-linux.org/themes/calculate/dm-login-${PV}-r1.jpg -> ${PN}-login-${PV}.jpg
+	http://mirror.yandex.ru/calculate/themes/calculate/dm-login-${PV}-r1.jpg -> ${PN}-login-${PV}.jpg )
+	splash? ( http://mirror.calculate-linux.org/themes/calculate/dm-splash-${PV}.jpg -> ${PN}-splash-${PV}.jpg
+	http://mirror.yandex.ru/calculate/themes/calculate/dm-splash-${PV}.jpg -> ${PN}-splash-${PV}.jpg )"
+
+DEPEND="!<sys-apps/calculate-utils-3.5.2.6"
+
+# need for templates
+RDEPEND="${DEPEND}
+	media-gfx/imagemagick"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/themes/Calculate/
+	use login && newins "${DISTDIR}"/${PN}-login-${PV}.jpg dm-login.jpg
+	use splash && newins "${DISTDIR}"/${PN}-splash-${PV}.jpg dm-splash.jpg
+}
+