diff --git a/net-im/swift/swift-3.0.ebuild b/net-im/swift/swift-3.0.ebuild
index ea68063..6022d3f 100644
--- a/net-im/swift/swift-3.0.ebuild
+++ b/net-im/swift/swift-3.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="6"
 
-inherit scons-utils toolchain-funcs linux-info
+inherit scons-utils toolchain-funcs
 
 if [[ ${PV} = "9999" ]] ; then
 	EGIT_REPO_URI="git://swift.im/swift"
@@ -40,7 +40,7 @@ DEPEND="${RDEPEND}
 		>=app-text/docbook-xml-dtd-4.5
 		dev-libs/libxslt
 	)"
-LANGS="ca de es fr gl he hu nl pl ru sk sv"
+LANGS="ca cs de es fr gl he hu nl pl ru sk sv"
 for X in ${LANGS} ; do
 	IUSE="${IUSE} l10n_${X}"
 done
@@ -54,23 +54,20 @@ set_scons_targets() {
 src_prepare() {
 	# remove all bundled packages to ensure
 	# consistency of headers and linked libraries
-	rm -rf 3rdparty || die
+	rm -r 3rdParty || die
 
 	for x in ${LANGS}; do
 		if use !l10n_${x}; then
-			rm -f Swift/Translations/swift_${x}.ts || die
+			rm Swift/Translations/swift_${x}.ts || die
 		fi
 	done
 
 	if use !zeroconf; then
-		rm -rf Slumber || die
+		rm -r Slimber || die
 	fi
 
-	rm -rf Swift || die
+	rm -r Swift || die
 
-	sed -i BuildTools/SCons/Tools/qt4.py \
-		-e "s/linux2/linux${KV_MAJOR}/" \
-		|| die
 	eapply_user
 }
 
diff --git a/net-im/swift/swift-9999.ebuild b/net-im/swift/swift-9999.ebuild
index e60a3be..6022d3f 100644
--- a/net-im/swift/swift-9999.ebuild
+++ b/net-im/swift/swift-9999.ebuild
@@ -40,7 +40,7 @@ DEPEND="${RDEPEND}
 		>=app-text/docbook-xml-dtd-4.5
 		dev-libs/libxslt
 	)"
-LANGS="ca de es fr gl he hu nl pl ru sk sv"
+LANGS="ca cs de es fr gl he hu nl pl ru sk sv"
 for X in ${LANGS} ; do
 	IUSE="${IUSE} l10n_${X}"
 done
@@ -54,7 +54,7 @@ set_scons_targets() {
 src_prepare() {
 	# remove all bundled packages to ensure
 	# consistency of headers and linked libraries
-	rm -r 3rdparty || die
+	rm -r 3rdParty || die
 
 	for x in ${LANGS}; do
 		if use !l10n_${x}; then
@@ -63,7 +63,7 @@ src_prepare() {
 	done
 
 	if use !zeroconf; then
-		rm -r Slumber || die
+		rm -r Slimber || die
 	fi
 
 	rm -r Swift || die