diff --git a/zsh/icc b/zsh/icc
index 4ba5fa5..97e8502 100755
--- a/zsh/icc
+++ b/zsh/icc
@@ -1,25 +1,24 @@
 local iccvars_path;
-# are we linux?
-case `uname -s` in
-	Linux)
-		iccvars_path=/opt/intel/Compiler/11.0/074/bin/iccvars.sh
-		if [[ -r $iccvars_path ]] ; then
-			case `uname -m` in
-				x86_64)
-					source $iccvars_path intel64
-				;;
-				i*86)
-					source $iccvars_path ia32
-				;;
-				ia64)
-					source $iccvars_path ia64
-				;;
-			esac
-		else
-			iccvars_path=/opt/intel/cc/10.1.018/bin/iccvars.sh
-			if [[ -r $iccvars_path ]] ; then
-					source $iccvars_path
-			fi
-		fi
-	;;
-esac
+iccvars_path=$(echo /opt/intel/Compiler/11.*/*/bin/iccvars.sh(On[1]))
+if [[ -r $iccvars_path ]] ; then
+	case `uname -m` in
+		x86_64)
+			source $iccvars_path intel64
+		;;
+		i*86)
+			source $iccvars_path ia32
+		;;
+		ia64)
+			source $iccvars_path ia64
+		;;
+	esac
+else
+	if [[ `uname -m` == x86_64 ]] ; then
+		iccvars_path=$(echo /opt/intel/cce/(10|9).*/bin/iccvars.sh(On[1]))
+	else
+		iccvars_path=$(echo /opt/intel/cc/(10|9).*/bin/iccvars.sh(On[1]))
+	fi
+	if [[ -r $iccvars_path ]] ; then
+		source $iccvars_path
+	fi
+fi
diff --git a/zshrc b/zshrc
index e690dce..851c902 100644
--- a/zshrc
+++ b/zshrc
@@ -177,9 +177,6 @@ bindkey ' ' magic-space
 
 bindkey -M emacs '\ee' edit-command-line
 
-bindkey -M emacs '^P' history-incremental-search-forward
-bindkey -M emacs '^N' history-incremental-search-backward
-
 case $TERM in
 	xterm*)
 		bindkey '\e[H' beginning-of-line