diff --git a/dev-libs/Ice/Ice-3.6.1.ebuild b/dev-libs/Ice/Ice-3.6.1.ebuild
index 65794b0..eaed29b 100644
--- a/dev-libs/Ice/Ice-3.6.1.ebuild
+++ b/dev-libs/Ice/Ice-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -159,7 +159,6 @@ src_configure() {
 	if has_version ">dev-lang/mono-4"; then
 		MAKE_RULES_CS="${MAKE_RULES_CS} MCS=mcs"
 	fi
-	MAKE_RULES_PHP="USE_NAMESPACES=yes"
 
 	use test && python_setup
 }
@@ -183,13 +182,13 @@ src_compile() {
 			sed -i \
 				-e "s|php-config|${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config|" \
 				php/src/IcePHP/Makefile || die "sed failed"
-			ln -s ${S}/cpp
-			ln -s ${S}/config
-			ln -s ${S}/slice
-			ln -s ${S}/Makefile
+			ln -s "${S}/cpp"
+			ln -s "${S}/config"
+			ln -s "${S}/slice"
+			ln -s "${S}/Makefile"
 
 			if use php_namespaces ; then
-				MAKE_RULES_PHP="${MAKE_RULES_PHP} USE_NAMESPACES=yes"
+				MAKE_RULES_PHP="USE_NAMESPACES=yes"
 			fi
 			emake -C php ${MAKE_RULES} ${MAKE_RULES_PHP} || die "emake php failed"
 		done
@@ -233,8 +232,8 @@ src_install() {
 	if use php ; then
 		insinto "/usr/share/php/${PN}"
 		doins $(cd php/lib; find ${S}/php/lib/ -name '*.php' -print)
-		for dir in $( cd ${D}/usr/share/${P}/slice ; ls -1 ); do
-			mkdir -p ${D}/usr/share/php/${dir}
+		for dir in $( cd "${D}/usr/share/${P}/slice" ; ls -1 ); do
+			mkdir -p "${D}/usr/share/php/${dir}""
 			LD_LIBRARY_PATH="${D}/usr/$(get_libdir):${LD_LIBRARY_PATH}" ${D}/usr/bin/slice2php -I${D}/usr/share/${P}/slice/ --all --output-dir ${D}/usr/share/php/${dir} --ice ${D}/usr/share/${P}/slice/${dir}/*
 		done