--- wpa_supplicant-1.0-r1.ebuild	2012-10-04 08:47:35.000000000 -0500
+++ wpa_supplicant-1.0-r1.ebuild.new	2012-10-05 12:55:02.227466140 -0500
@@ -75,11 +75,12 @@
 		| tee -a dbus/*.service >/dev/null || die
 
 	if use wimax; then
-		cd "${WORKDIR}/${P}"
+		pushd "${WORKDIR}/${P}"
 		epatch "${FILESDIR}/${P}-generate-libeap-peer.patch"
 
 		# multilib-strict fix (bug #373685)
 		sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile
+		popd
 	fi
 
 	# bug (320097)