diff --git a/eclass/calculate-utils.eclass b/eclass/calculate-utils.eclass
index 37984a0b8..8b358987c 100644
--- a/eclass/calculate-utils.eclass
+++ b/eclass/calculate-utils.eclass
@@ -186,7 +186,10 @@ RDEPEND="
 
 	qt4? (
 		dev-python/dbus-python[python_targets_python2_7]
-		virtual/python-imaging[python_targets_python2_7]
+		|| (
+			dev-python/pillow[python_targets_python2_7]
+			dev-python/python-imaging[python_targets_python2_7]
+		)
 		dev-python/pyside[script,python_targets_python2_7]
 	)
 
diff --git a/sys-apps/calculate-utils/calculate-utils-3.4.1.1-r8.ebuild b/sys-apps/calculate-utils/calculate-utils-3.4.1.1-r8.ebuild
new file mode 100644
index 000000000..95cf734cf
--- /dev/null
+++ b/sys-apps/calculate-utils/calculate-utils-3.4.1.1-r8.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+PYTHON_COMPAT=(python2_7)
+
+declare -A CALCULATE_MODULES=(
+	["update"]="3.4.1.1"
+	["builder"]="3.4.1.1"
+	["console-gui"]="3.4.1.1"
+)
+
+inherit calculate-utils
+
+DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade"
+HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="amd64 x86"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# fix prepare
+	epatch "${FILESDIR}/calculate-builder-3.4.1.1-fix_prepare.patch"
+
+	# fix lock builder.env, fix remerge
+	epatch "${FILESDIR}/calculate-lib-3.4.1.1-fix_lock_remerge.patch"
+
+	# update handbook
+	epatch "${FILESDIR}/calculate-install-3.4.1-update_handbook.patch"
+
+	if use desktop
+	then
+		# fix sync faces
+		epatch "${FILESDIR}/calculate-desktop-3.4.1.1-fix_faces_sync.patch"
+	fi
+	if use qt4
+	then
+		# fix plasma logout
+		epatch "${FILESDIR}/calculate-console-gui-3.4.1.1-plasma_logout.patch"
+	fi
+}