diff --git a/zshrc b/zshrc
index 74bf656..c0fdc78 100644
--- a/zshrc
+++ b/zshrc
@@ -87,7 +87,7 @@ export LESS=' -R'
 alias cd..='cd ..'
 
 case `uname -s` in
-	Linux|CYGWIN_NT-5.1)
+	Linux|CYGWIN_NT*)
 		alias ls="ls -h --color=auto"
 		alias grep='grep -d skip --color=auto'
 	;;
@@ -187,8 +187,6 @@ case $TERM in
 	interix)
 		bindkey '^[[H' beginning-of-line
 		bindkey '^[[U' end-of-line
-		bindkey '^[[C' emacs-forward-word
-		bindkey '^[[D' emacs-backward-word
 	;;
 	cygwin)
 		bindkey '^[[1~' beginning-of-line
@@ -327,7 +325,7 @@ case `uname -s` in
 			zstyle ':completion:*:processes-names' command 'ps -A -o command | awk "NR != 1"'
 		fi
 	;;
-	CYGWIN_NT-5.1)
+	CYGWIN_NT*)
 		zstyle ':completion:*:processes-names' command 'ps -u '${USERNAME}' -s | awk "NR != 1"'
 	;;
 esac
@@ -339,7 +337,7 @@ case `uname -s` in
 	Interix)
 		zstyle ':completion:*:*:kill:*:processes' command 'ps -i -U '${USERNAME}' -o pid,args | sed "/ps -i -U '${USERNAME}' -o pid,args/d"'
 	;;
-	CYGWIN_NT-5.1)
+	CYGWIN_NT*)
 		zstyle ':completion:*:*:kill:*:processes' command 'ps -u '${USERNAME}' -s | sed "/ps -u '${USERNAME}' -s/d"'
 	;;
 	SunOS|FreeBSD|OpenBSD)
@@ -354,7 +352,7 @@ case `uname -s` in
 	Interix|SunOS|FreeBSD|Linux)
 		zstyle ':completion:*:*:killall:*:processes-names' command "ps -U '${USERNAME}' -o comm"
 	;;
-	CYGWIN_NT-5.1)
+	CYGWIN_NT*)
 		zstyle ':completion:*:*:killall:*:processes-names' command "ps -u '${USERNAME}' -s"
 	;;
 	Darwin)